walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #705 from simartin/restore_osx_default_build 

Restore build on OSX, where make defines CXX as "c++" by default.
This commit is contained in:
Matthias Krüger 2015-11-14 10:29:33 +01:00
parent e1342435ca 14d2830e49
commit 82dd644b52
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -87,6 +87,10 @@ ifeq ($(CXX), g++)
override CXXFLAGS += -std=c++0x
else ifeq ($(CXX), clang++)
override CXXFLAGS += -std=c++0x
else ifeq ($(CXX), c++)
ifeq ($(shell uname -s), Darwin)
override CXXFLAGS += -std=c++0x
endif
endif
ifeq ($(HAVE_RULES),yes)

4
tools/dmake.cpp
View File

@ -359,6 +359,10 @@ int main(int argc, char **argv)
<< " override CXXFLAGS += -std=c++0x\n"
<< "else ifeq ($(CXX), clang++)\n"
<< " override CXXFLAGS += -std=c++0x\n"
<< "else ifeq ($(CXX), c++)\n"
<< " ifeq ($(shell uname -s), Darwin)\n"
<< " override CXXFLAGS += -std=c++0x\n"
<< " endif\n"
<< "endif\n"
<< "\n";