aboutsummaryrefslogtreecommitdiff
path: root/build2/context.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-06-27 16:59:09 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-06-27 16:59:09 +0200
commit41cad5bba8a718a0403c0578660c60e81c9f46e4 (patch)
tree7eebba42dac307fdfcf600f5f6527afe0c0f4fea /build2/context.cxx
parent34cc74df52ed129bffeb7b6fcf11f05c222550ba (diff)
Add config.bin.target var/hint, use to decide libso{} install mode
Normally the user doesn't need to specify config.bin.target explicitly since the cxx module will hint it. We now also have the whole set of target's components: bin.target.{cpu,vendor,system,version,class}
Diffstat (limited to 'build2/context.cxx')
-rw-r--r--build2/context.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/build2/context.cxx b/build2/context.cxx
index 3e9fe4a..59eb912 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -43,6 +43,9 @@ namespace build2
{
tracer trace ("reset");
+ // @@ Need to unload modules when we dynamically load them.
+ //
+
l6 ([&]{trace << "resetting build state";});
variable_overrides vos;
@@ -183,7 +186,7 @@ namespace build2
if (c == '!' || !dir.empty ())
{
scope& s (c == '!' ? gs : scopes.insert (dir, false)->second);
- auto p (s.vars.assign (*o));
+ auto p (s.vars.insert (*o));
if (!p.second)
{