From 3d716e8490678f00f844dc4e74eb2695b46ef9b8 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 15 May 2014 23:30:07 +0200
Subject: add cxxflags attribute possibility for buildtool. fixes warnings for
 c-files (-Woverloaded-virtual)

(bzr r13382)
---
 buildtool.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'buildtool.cpp')

diff --git a/buildtool.cpp b/buildtool.cpp
index 060c352da..a43bb0192 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -6918,7 +6918,9 @@ public:
         String cxxCommand      = parent.eval(cxxCommandOpt, "g++");
         String source          = parent.eval(sourceOpt, ".");
         String dest            = parent.eval(destOpt, ".");
-        String flags           = parent.eval(flagsOpt, "");
+        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,7 +7029,10 @@ public:
             String command = ccCommand;
             if (sfx == "cpp" || sfx == "cxx" || sfx == "c++" ||
                  sfx == "cc" || sfx == "CC")
+            {
                 command = cxxCommand;
+                flags += " " + cxxflags;
+            }
  
             //## Make paths
             String destPath = dest;
@@ -7203,6 +7208,12 @@ public:
                     return false;
                 flagsOpt = strip(flagsOpt);
                 }
+            else if (tagName == "cxxflags")
+                {
+                if (!parent.getValue(child, cxxflagsOpt))
+                    return false;
+                cxxflagsOpt = strip(cxxflagsOpt);
+                }
             else if (tagName == "includes")
                 {
                 if (!parent.getValue(child, includesOpt))
@@ -7239,6 +7250,7 @@ protected:
     String   sourceOpt;
     String   destOpt;
     String   flagsOpt;
+    String   cxxflagsOpt;
     String   definesOpt;
     String   includesOpt;
     String   continueOnErrorOpt;
-- 
cgit v1.2.3