Merge pull request #705 from simartin/restore_osx_default_build

matthiaskrgr · matthiaskrgr · commit 82dd644b52df · 2015-11-14T10:29:33.000+01:00
Restore build on OSX, where make defines CXX as "c++" by default.
diff --git a/Makefile b/Makefile
@@ -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)
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
@@ -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";
 
