From e20a351013745e8d6c3a0a99bd40c172ed0ae8be Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 14 Mar 2019 17:20:02 +0200 Subject: 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 --- build2/parser.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build2/parser.cxx') 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; } -- cgit v1.1