diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-05-15 21:36:07 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-05-15 21:36:07 +0000 |
| commit | 01b7025b3bcb7b2e87c02519d616480b2dd3e578 (patch) | |
| tree | 8eef281e373ed03635adaed2ad0f3e1a646d92de /buildtool.cpp | |
| parent | add cxxflags attribute possibility for buildtool. fixes warnings for c-files ... (diff) | |
| download | inkscape-01b7025b3bcb7b2e87c02519d616480b2dd3e578.tar.gz inkscape-01b7025b3bcb7b2e87c02519d616480b2dd3e578.zip | |
fix buildtool cxxflags bug
(bzr r13383)
Diffstat (limited to 'buildtool.cpp')
| -rw-r--r-- | buildtool.cpp | 2 |
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") { |