summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-05-15 21:34:48 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-05-15 21:34:48 +0000
commit18282d489ba50d7965fc39b481bea5de602b0994 (patch)
treed05e18c80cbd3e8af0d46a1d5736d7c7c083ce6f
parentadd cxxflags attribute possibility for buildtool. fixes warnings for c-files ... (diff)
downloadinkscape-18282d489ba50d7965fc39b481bea5de602b0994.tar.gz
inkscape-18282d489ba50d7965fc39b481bea5de602b0994.zip
make buildtool cxxflags actually work
(bzr r13341.1.28)
-rw-r--r--buildtool.cpp2
1 files changed, 1 insertions, 1 deletions
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")
{