From 727531fc3d097413cfc9e972a83abadebed3f35d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 14 Jun 2022 05:43:17 +0200 Subject: Pass both depends and alternative indexes to evaluate_*() functions --- bpkg/pkg-build.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bpkg/pkg-build.cxx') diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index ca3387f..9a92df7 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -3278,7 +3278,8 @@ namespace bpkg { const dependency_alternative& da (das[i]); - if (!da.enable || skel.evaluate_enable (*da.enable, di)) + if (!da.enable || + skel.evaluate_enable (*da.enable, make_pair (di, i))) edas.push_back (make_pair (ref (da), i)); } } @@ -4948,7 +4949,7 @@ namespace bpkg salts.push_back (dai); if (da.reflect) - skel.evaluate_reflect (*da.reflect, di); + skel.evaluate_reflect (*da.reflect, make_pair (di, dai)); selected = true; }; @@ -6349,7 +6350,7 @@ namespace bpkg // Evaluate reflect, if present. // if (da.reflect) - b->skeleton->evaluate_reflect (*da.reflect, di); + b->skeleton->evaluate_reflect (*da.reflect, make_pair (di, dai)); } // Continue recursively collecting the dependent. -- cgit v1.1