Hack the makefiles to make OSX build.

Author: thewilsonator

test/common.mak

@@ -17,18 +17,20 @@ ROOT:=$(GENERATED)/$(OS)/$(BUILD)/$(MODEL)
 ifneq (default,$(MODEL))
 	MODEL_FLAG:=-m$(MODEL)
 endif
-CFLAGS:=$(MODEL_FLAG) $(PIC) -Wall
+CFLAGS_BASE:= $(MODEL_FLAG) $(PIC) -Wall
 DFLAGS:=$(MODEL_FLAG) $(PIC) -w -I../../src -I../../import -I$(SRC) -defaultlib= -debuglib= -dip1000
 # LINK_SHARED may be set by importing makefile
 DFLAGS+=$(if $(LINK_SHARED),-L$(DRUNTIMESO),-L$(DRUNTIME))
 ifeq ($(BUILD),debug)
 	DFLAGS += -g -debug
-	CFLAGS += -g
+	CFLAGS := $(CFLAGS_BASE) -g
 else
 	DFLAGS += -O -release
-	CFLAGS += -O3
+	CFLAGS := $(CFLAGS_BASE) -O3
 endif
+CXXFLAGS_BASE := $(CFLAGS_BASE) -std=c++11
 CXXFLAGS:=$(CFLAGS) -std=c++11
 ifeq (osx,$(OS))
 	CXXFLAGS+=-stdlib=libc++
+	CXXFLAGS_BASE+=-stdlib=libc++
 endif

test/stdcpp/Makefile

@@ -22,7 +22,7 @@ $(ROOT)/%.done : $(ROOT)/%
 $(ROOT)/%: $(SRC)/%.cpp $(SRC)/%_test.d
 	mkdir -p $(dir $@)
 	$(QUIET)$(DMD) $(DFLAGS) -main -unittest -c -of=$(ROOT)/$*_d.o $(SRC)/$*_test.d
-	$(QUIET)$(CXX) $(CXXFLAGS) -o $@ $< $(ROOT)/$*_d.o $(DRUNTIME) -lpthread
+	$(QUIET)$(CXX) $(CXXFLAGS_BASE) -o $@ $< $(ROOT)/$*_d.o $(DRUNTIME) -lpthread
 
 clean:
 	rm -rf $(GENERATED)