diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-16 11:30:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-16 11:30:41 +0200 |
| commit | 63d1d6f8f4bb6db482b21e728245ebf9eee6b55f (patch) | |
| tree | 61f1b519a447fd2b96c877bfced4b9fc8363824e /build2/cc/compile-rule.cxx | |
| parent | ef12b3bf80e2eec3fcfd36cceee02f357a992039 (diff) | |
Fix group link-up race
Diffstat (limited to 'build2/cc/compile-rule.cxx')
| -rw-r--r-- | build2/cc/compile-rule.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx index a6d2d48..632a9bf 100644 --- a/build2/cc/compile-rule.cxx +++ b/build2/cc/compile-rule.cxx @@ -3537,6 +3537,7 @@ namespace build2 // Find the mxx{} prerequisite and extract its "file name" for the // fuzzy match unless the user specified the module name explicitly. // + resolve_group (a, *pt); for (prerequisite_member p: group_prerequisite_members (a, *pt)) { if (p.is_a (*x_mod)) @@ -3649,6 +3650,8 @@ namespace build2 if (in != mn) { + // Note: matched, so the group should be resolved. + // for (prerequisite_member p: group_prerequisite_members (a, *bt)) { if (p.is_a (*x_mod)) // Got to be there. @@ -3865,6 +3868,8 @@ namespace build2 // sort things out. This is pretty similar to what we do in link when // synthesizing dependencies for bmi{}'s. // + // Note: lt is matched and so the group is resolved. + // ps.push_back (prerequisite (lt)); for (prerequisite_member p: group_prerequisite_members (a, lt)) { |