From 9e9bc1e457648ef2b8e0de97de686f2435916ee4 Mon Sep 17 00:00:00 2001 From: Alexander Mai Date: Sun, 27 Apr 2014 18:56:30 +0200 Subject: [PATCH] Since reduce shares object files with cppcheck it should use the same compiler and linker flags --- Makefile | 2 +- tools/dmake.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ccdac4435..9f5ab028f 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ dmake: tools/dmake.cpp ./dmake reduce: tools/reduce.cpp $(LIBOBJ) - $(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.cpp $(LDFLAGS) $(RDYNAMIC) clean: rm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce cppcheck cppcheck.1 diff --git a/tools/dmake.cpp b/tools/dmake.cpp index fbebcb04e..80abdc744 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -392,7 +392,7 @@ int main(int argc, char **argv) fout << "\t$(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS)\n"; fout << "\t./dmake\n\n"; fout << "reduce:\ttools/reduce.cpp $(LIBOBJ)\n"; - fout << "\t$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.cpp\n\n"; + fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.cpp $(LDFLAGS) $(RDYNAMIC)\n\n"; fout << "clean:\n"; fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o externals/tinyxml/*.o testrunner reduce cppcheck cppcheck.1\n\n"; fout << "man:\tman/cppcheck.1\n\n";