diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-04 12:45:08 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-08-04 12:45:08 +0200 |
commit | afca05688dd09da5cc0cc23e72def813562e80db (patch) | |
tree | 46cfeb4ced950f128884873083d7a89b75a0015e /build2/cc/link.cxx | |
parent | de8e93420527598bbf2c96ef44f74e3856c65c3b (diff) |
Implement sidebuilding of installed modules
Diffstat (limited to 'build2/cc/link.cxx')
-rw-r--r-- | build2/cc/link.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 41455e5..06c4bee 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -710,6 +710,8 @@ namespace build2 // might depend on the imported one(s) which we will never "see" // unless we start with this library. // + // Note: have similar logic in make_module_sidebuild(). + // size_t j (start); for (prerequisite_member p: group_prerequisite_members (act, t)) { @@ -719,7 +721,7 @@ namespace build2 p.is_a<liba> () || p.is_a<libs> () || p.is_a<libux> () || p.is_a<bmi> () || p.is_a (tt.bmi)) { - ps.emplace_back (p.as_prerequisite ()); + ps.push_back (p.as_prerequisite ()); } else if (x_mod != nullptr && p.is_a (*x_mod)) // Chained module. { @@ -734,7 +736,7 @@ namespace build2 bool group (j < i && !p.prerequisite.belongs (t)); unmark (pt); - ps.emplace_back (prerequisite (group ? *pt->group : *pt)); + ps.push_back (prerequisite (group ? *pt->group : *pt)); } } } |