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/target.hxx | |
| 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/target.hxx')
| -rw-r--r-- | build2/target.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/target.hxx b/build2/target.hxx index c86a10b..fafb689 100644 --- a/build2/target.hxx +++ b/build2/target.hxx @@ -399,7 +399,7 @@ namespace build2 find (const variable& var) const { auto p (find_original (var)); - return var.override == nullptr + return var.overrides == nullptr ? p : base_scope ().find_override (var, move (p), true); } @@ -534,7 +534,7 @@ namespace build2 find (const variable& var) const { auto p (find_original (var)); - return var.override == nullptr + return var.overrides == nullptr ? p : target_->base_scope ().find_override (var, move (p), true, true); } |