From 41cad5bba8a718a0403c0578660c60e81c9f46e4 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 27 Jun 2016 16:59:09 +0200 Subject: 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} --- build2/context.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'build2/context.cxx') 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) { -- cgit v1.1