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/target.hxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'build2/target.hxx')

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);
       }
-- 
cgit v1.1