diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-05 10:01:24 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-05 10:01:24 +0200 |
| commit | e3a6b031d0ee4bd56b2a2296d5faeaff142e3569 (patch) | |
| tree | 022f5722955510976bc08bdadbf81831da762f23 | |
| parent | 7e29381f48967c0f9588bb749cd3702b170c3709 (diff) | |
Fix bug in library meta-information protocol implementation
| -rw-r--r-- | build2/cc/compile.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index b301709..04113e7 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -492,16 +492,18 @@ namespace build2 const target* pt (nullptr); // A dependency on a library is there so that we can get its - // *.export.poptions. This is the "library meta-information - // protocol". See also append_lib_options(). + // *.export.poptions, modules, etc. This is the "library + // meta-information protocol". See also append_lib_options(). // if (p.is_a<lib> () || p.is_a<liba> () || p.is_a<libs> ()) { if (act.operation () == update_id) { - // Handle imported libraries. We know that for such libraries we - // don't need to do match() in order to get options (if any, they - // would be set by search_library()). + // Handle (phase two) imported libraries. We know that for such + // libraries we don't need to do match() in order to get options + // (if any, they would be set by search_library()). + // + // @@ MOD: for now the same applies to modules? // if (p.proj ()) { @@ -517,8 +519,8 @@ namespace build2 if (const lib* l = pt->is_a<lib> ()) pt = &link_member (*l, act, lo); } - - continue; + else + continue; } else { |