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/dump.cxx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'build2/dump.cxx')

diff --git a/build2/dump.cxx b/build2/dump.cxx
index 8f58488..d9a1855 100644
--- a/build2/dump.cxx
+++ b/build2/dump.cxx
@@ -96,10 +96,7 @@ namespace build2
       //
       if (k != variable_kind::prerequisite)
       {
-        if (var.override != nullptr &&
-            var.name.rfind (".__override") == string::npos &&
-            var.name.rfind (".__suffix") == string::npos &&
-            var.name.rfind (".__prefix") == string::npos)
+        if (var.overrides != nullptr && !var.override ())
         {
           lookup org (v, var, vm);
 
-- 
cgit v1.1