From 417a916ece97aa3f37337a66d71436ef51ff2396 Mon Sep 17 00:00:00 2001 From: Alexander Mai Date: Sun, 4 May 2014 20:52:54 +0200 Subject: [PATCH] Use CXXFLAGS upon linking dmake for consistency --- Makefile | 2 +- tools/dmake.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3151af86c..b6b37529b 100644 --- a/Makefile +++ b/Makefile @@ -239,7 +239,7 @@ check: all ./testrunner -g -q dmake: tools/dmake.o cli/filelister.o lib/path.o - $(CXX) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS) + $(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS) ./dmake reduce: tools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ) diff --git a/tools/dmake.cpp b/tools/dmake.cpp index 2828160a8..03caf746c 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -392,7 +392,7 @@ int main(int argc, char **argv) fout << "check:\tall\n"; fout << "\t./testrunner -g -q\n\n"; fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n"; - fout << "\t$(CXX) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n"; + fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n"; fout << "\t./dmake\n\n"; fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n"; fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";