Merge pull request #24 from basho/jem-fix-bsd-compile

Fix FreeBSD package compilation
krestenkrab · Jun 13, 2012 · d4e2fd02d337615791b56fdbb3c4e438e690400f · d4e2fd0
2 parents ae497d2 + 0f6c3cc
commit d4e2fd02d337615791b56fdbb3c4e438e690400f
Unified Split

Showing with 9 additions and 3 deletions.

+2 −2 GNUmakefile

+1 −0 Makefile

+6 −1 rebar.config
diff --git a/GNUmakefile b/GNUmakefile
@@ -24,7 +24,7 @@ test: all
 docs: all
 	@mkdir -p docs
 	@./build_docs.sh
-	
-.PHONY: c_src docs
+
+.PHONY: c_src c_src_clean docs
 
 include rebar.mk
diff --git a/Makefile b/Makefile
@@ -16,6 +16,7 @@ docs:
 
 c_src: FORCE
 	@gmake c_src
+
 FORCE:
 
 c_src_clean:
diff --git a/rebar.config b/rebar.config
@@ -26,7 +26,12 @@
 
              %% OS X Snow Leopard flags for 32-bit
              {"darwin10.*-32$", "CFLAGS", "-m32"},
-             {"darwin10.*-32$", "LDFLAGS", "-arch i386"}
+             {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+
+             %% Prevent the make->gmake transition from infecting
+             %% MAKEFLAGS with bad flags that confuse gmake
+             {"freebsd.*", "MAKEFLAGS", ""}
+
             ]}.
 
 {pre_hooks, [{compile, "make c_src"}]}.