Merge pull request #3 from stan-dev/feature/fix-cross-compilation

Feature/fix cross compilation

.gitignore

@@ -11,3 +11,6 @@
 /src/test/test-models/*
 !/src/test/test-models/*.stan
 !/src/test/test-models/*.R
+
+# local make include
+make/local

make/local

@@ -0,0 +1,4 @@
+##
+# Can put stuff that is specific to your computer here, e.g.
+# CFLAGS += -march=native
+##

make/models

@@ -14,5 +14,5 @@ $(patsubst %.stan,%,$(wildcard $(addsuffix .stan,$(MAKECMDGOALS)))) : %$(EXE) :
 %.cpp : %.stan $(MODEL_HEADER) bin/stanc$(EXE)
 	@echo ''
 	@echo '--- Translating Stan model to C++ code ---'
-	bin/stanc$(EXE) $< --o=$@ --no_main
+	$(WINE) bin$(PATH_SEPARATOR)stanc$(EXE) $< --o=$@ --no_main
 

make/os_linux

@@ -14,13 +14,12 @@ ifeq (g++,$(CC_TYPE))
   endif
 endif
 ifeq (mingw32-g++,$(CC_TYPE))
-  CFLAGS += -m32
   CFLAGS_GTEST += -DGTEST_HAS_PTHREAD=0
-  LDLIBS_STANC += -static-libgcc
-  LDLIBS_STANC += -static-libstdc++
-  LDLIBS += -static-libgcc
-  LDLIBS += -static-libstdc++
+  LDLIBS_STANC += -static
+  LDLIBS += -static
+  LDFLAGS += -lwinpthread
   EXE = .exe
+  WINE = wine
 endif
 ifeq (clang++,$(CC_TYPE))
 #  CFLAGS += -stdlib=libc++

make/tests

@@ -71,7 +71,7 @@ test/%$(EXE) : test/%.o bin/libstan.a
 	@mkdir -p $(dir $@)
 	$(LINK.c) -O$O $(GTEST_MAIN) $< $(CFLAGS_GTEST) $(OUTPUT_OPTION) $(LIBGTEST) $(LDLIBS)
 ifeq ($(strip $(findstring src/test/,$(MAKECMDGOALS))), )
-	$@ --gtest_output="xml:$(basename $@).xml"
+	$(WINE) $@ --gtest_output="xml:$(basename $@).xml"
 endif
 
 ####
@@ -95,7 +95,7 @@ endef
 .SECONDEXPANSION:
 .PHONY: $(TEST_TARGETS)
 $(TEST_TARGETS): src/test/%: $$(filter $$(patsubst src/$$(PERCENT),$$(PERCENT),$$@)/$$(PERCENT),$$(ALL_TEST_EXECUTABLES))
-	$(foreach test,$^,$(test) --gtest_output="xml:$(basename $(test)).xml"; $n)
+	$(foreach test,$^,$(WINE) $(test) --gtest_output="xml:$(basename $(test)).xml"; $n)
 	@echo ''
 	@echo 'Ran '$(words $(filter test/%,$^))' tests for '$@
 else