diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2019-03-14 17:20:02 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-03-14 17:20:02 +0200 |
commit | e20a351013745e8d6c3a0a99bd40c172ed0ae8be (patch) | |
tree | b0e6d24dbc097c2001e6bb4b0c0357bcb83bdc72 /build2/parser.cxx | |
parent | d1b3ad7b302d037c8154bab9c4810d499c0bf1e4 (diff) |
Add support for multiple variable overrides
Now we can do:
$ b config.cxx.coptions=-O3 config.cxx.coptions=-O0
Or even:
$ b config.cxx.coptions=-O3 config.cxx.coptions+=-g
Diffstat (limited to 'build2/parser.cxx')
-rw-r--r-- | build2/parser.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 3acff37..997a1ac 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -5108,7 +5108,7 @@ namespace build2 if (!r.first.defined ()) r = t->find_original (var); - return var.override == nullptr + return var.overrides == nullptr ? r.first : t->base_scope ().find_override (var, move (r), true).first; } |