diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-02 10:20:50 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:42:41 +0200 |
| commit | 53f02bf28dae507a51515ed6ac03226d68816494 (patch) | |
| tree | 234838165e802df9c777324c0fe766ce0190d814 /build2/cc | |
| parent | 601ffbd700e7c11a101215d641ea09d0181d4771 (diff) | |
Store extension in target map key rather than in target
This is in preparation for locking its modification/access.
Diffstat (limited to 'build2/cc')
| -rw-r--r-- | build2/cc/compile.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/link.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx index 2176b82..1fed762 100644 --- a/build2/cc/compile.cxx +++ b/build2/cc/compile.cxx @@ -422,7 +422,7 @@ namespace build2 // only use the target type and name from the target key so we can // pass bogus values for the rest. // - target_key tk {&tt, nullptr, nullptr, &n, target_key::nullext}; + target_key tk {&tt, nullptr, nullptr, &n, nullopt}; // This is like prerequisite search. // diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index d85faed..7798c95 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -549,7 +549,7 @@ namespace build2 } if (pt == nullptr) - pt = &search (ott, o.dir, o.out, o.name, o.ext, nullptr); + pt = &search (ott, o.dir, o.out, o.name, o.ext (), nullptr); } else pt = &ot; diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx index d32cd61..da6614f 100644 --- a/build2/cc/pkgconfig.cxx +++ b/build2/cc/pkgconfig.cxx @@ -419,9 +419,7 @@ namespace build2 string name (l, 2); // Sans -l. prerequisite_key pk { - nullopt, - {&lib::static_type, &out, &out, &name, target_key::nullext}, - &s}; + nullopt, {&lib::static_type, &out, &out, &name, nullopt}, &s}; if (lib* lt = static_cast<lib*> (search_library (sysd, usrd, pk))) { |