Permalink
Browse files

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

Fix FreeBSD package compilation
  • Loading branch information...
Jared Morrow
Jared Morrow committed Jun 13, 2012
2 parents ae497d2 + 0f6c3cc commit d4e2fd02d337615791b56fdbb3c4e438e690400f
Showing with 9 additions and 3 deletions.
  1. +2 −2 GNUmakefile
  2. +1 −0 Makefile
  3. +6 −1 rebar.config
View
@@ -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
View
@@ -16,6 +16,7 @@ docs:
c_src: FORCE
@gmake c_src
+
FORCE:
c_src_clean:
View
@@ -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"}]}.

0 comments on commit d4e2fd0

Please sign in to comment.