diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-25 15:41:44 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:39:24 +0200 |
| commit | 88f0780e34116c0441a8d8c58b8a8fd9fde4b1f5 (patch) | |
| tree | 1240b36211772479dc1220712e0daed4e35ecd85 /build2/cc/common.cxx | |
| parent | 61aa8e2b4bd7849838c04dc1f421c4760d88319f (diff) | |
Add model mutex, make var_pool const by default
Diffstat (limited to 'build2/cc/common.cxx')
| -rw-r--r-- | build2/cc/common.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx index 6429a38..b941e6e 100644 --- a/build2/cc/common.cxx +++ b/build2/cc/common.cxx @@ -4,7 +4,7 @@ #include <build2/cc/common> -#include <build2/file> // import() +#include <build2/file> // import() #include <build2/scope> #include <build2/context> #include <build2/variable> @@ -287,7 +287,7 @@ namespace build2 if (sysd == nullptr) find_sysd (); if (!lo) find_lo (); - file& t (resolve_library (n, bs, *lo, *sysd, usrd)); + file& t (resolve_library (bs, n, *lo, *sysd, usrd)); if (proc_lib) { @@ -386,8 +386,8 @@ namespace build2 // that's the only way to guarantee it will be up-to-date. // file& common:: - resolve_library (name n, - scope& s, + resolve_library (scope& s, + name n, lorder lo, const dir_paths& sysd, optional<dir_paths>& usrd) const @@ -768,7 +768,7 @@ namespace build2 const char* bl (lt.a != nullptr ? (lt.s != nullptr ? "both" : "static") : "shared"); - lt.assign ("bin.lib") = bl; + lt.assign (var_pool["bin.lib"]) = bl; target* r (l ? < : (p.is_a<liba> () ? static_cast<target*> (a) : s)); |