diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-14 05:43:17 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-14 14:46:53 +0200 |
| commit | 727531fc3d097413cfc9e972a83abadebed3f35d (patch) | |
| tree | 1a08ce91db415c94f12316222ee73ef7207e03fd /bpkg/pkg-configure.cxx | |
| parent | f4bec0b31dfe117aca94c2d72d489460c1f51057 (diff) | |
Pass both depends and alternative indexes to evaluate_*() functions
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 32cace3..477ead0 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -97,7 +97,7 @@ namespace bpkg { const dependency_alternative& da (das[i]); - if (!da.enable || ps.evaluate_enable (*da.enable, di)) + if (!da.enable || ps.evaluate_enable (*da.enable, make_pair (di, i))) { if (da.prefer || da.require) fail << "manual configuration of dependents with prefer or " @@ -273,7 +273,7 @@ namespace bpkg // Evaluate the dependency alternative reflect clause, if present. // if (da.reflect) - ps.evaluate_reflect (*da.reflect, di); + ps.evaluate_reflect (*da.reflect, make_pair (di, dai)); satisfied = true; break; |