diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-24 22:12:01 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-06-26 15:29:44 +0300 |
| commit | 58357d79110a925dcb3cdc734d812f17b6465c17 (patch) | |
| tree | 2b5f4714e038f1b0cefcca64b427e6ae9772833f /bpkg/pkg-configure.cxx | |
| parent | 86700536f5ca500c4a837d03626f672dcfdbb97d (diff) | |
Fix build order for test and main packages
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 225291b..cd55575 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -28,7 +28,7 @@ namespace bpkg database& db (t.database ()); - for (const dependency_alternatives& da: deps) + for (const dependency_alternatives_ex& da: deps) { assert (!da.conditional); //@@ TODO @@ -319,7 +319,13 @@ namespace bpkg true /* ignore_unknown */, [&p] (version& v) {v = p->version;})); - pkg_configure (c, o, t, p, m.dependencies, vars, false /* simulate */); + pkg_configure (c, + o, + t, + p, + convert (move (m.dependencies)), + vars, + false /* simulate */); } if (verb && !o.no_result ()) |