Restore build on OSX, where make defines CXX as "c++" by default.
This commit is contained in:
parent
e1342435ca
commit
14d2830e49
4
Makefile
4
Makefile
|
@ -87,6 +87,10 @@ ifeq ($(CXX), g++)
|
||||||
override CXXFLAGS += -std=c++0x
|
override CXXFLAGS += -std=c++0x
|
||||||
else ifeq ($(CXX), clang++)
|
else ifeq ($(CXX), clang++)
|
||||||
override CXXFLAGS += -std=c++0x
|
override CXXFLAGS += -std=c++0x
|
||||||
|
else ifeq ($(CXX), c++)
|
||||||
|
ifeq ($(shell uname -s), Darwin)
|
||||||
|
override CXXFLAGS += -std=c++0x
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(HAVE_RULES),yes)
|
ifeq ($(HAVE_RULES),yes)
|
||||||
|
|
|
@ -359,6 +359,10 @@ int main(int argc, char **argv)
|
||||||
<< " override CXXFLAGS += -std=c++0x\n"
|
<< " override CXXFLAGS += -std=c++0x\n"
|
||||||
<< "else ifeq ($(CXX), clang++)\n"
|
<< "else ifeq ($(CXX), clang++)\n"
|
||||||
<< " override CXXFLAGS += -std=c++0x\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"
|
<< "endif\n"
|
||||||
<< "\n";
|
<< "\n";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue