From e20a351013745e8d6c3a0a99bd40c172ed0ae8be Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
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/scope.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build2/scope.hxx')

diff --git a/build2/scope.hxx b/build2/scope.hxx
index 6e48de3..cfb3d24 100644
--- a/build2/scope.hxx
+++ b/build2/scope.hxx
@@ -125,7 +125,7 @@ namespace build2
           const string* tn = nullptr) const
     {
       auto p (find_original (var, tt, tn));
-      return var.override == nullptr ? p : find_override (var, move (p));
+      return var.overrides == nullptr ? p : find_override (var, move (p));
     }
 
     // Implementation details (used by scope target lookup). The start_depth
-- 
cgit v1.1