From 01b7025b3bcb7b2e87c02519d616480b2dd3e578 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 15 May 2014 23:36:07 +0200
Subject: fix buildtool cxxflags bug

(bzr r13383)
---
 buildtool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buildtool.cpp')

diff --git a/buildtool.cpp b/buildtool.cpp
index a43bb0192..ae3d40106 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -6920,7 +6920,6 @@ public:
         String dest            = parent.eval(destOpt, ".");
         String ccflags         = parent.eval(flagsOpt, "");
         String cxxflags        = parent.eval(cxxflagsOpt, "");
-        String flags           = ccflags;
         String defines         = parent.eval(definesOpt, "");
         String includes        = parent.eval(includesOpt, "");
         bool continueOnError   = parent.evalBool(continueOnErrorOpt, true);
@@ -7027,6 +7026,7 @@ public:
             //## Select command
             String sfx = dep.suffix;
             String command = ccCommand;
+            String flags = ccflags;
             if (sfx == "cpp" || sfx == "cxx" || sfx == "c++" ||
                  sfx == "cc" || sfx == "CC")
             {
-- 
cgit v1.2.3