Permalink
Browse files

Clear out MAKEFLAGS variable on FreeBSD that casued build errors

  • Loading branch information...
1 parent 99ea666 commit 0f6c3ccb08e4cfbd858262075d9a1294a207ca5f Jared Morrow committed Jun 13, 2012
Showing with 11 additions and 6 deletions.
  1. +1 −1 GNUmakefile
  2. +4 −4 Makefile
  3. +6 −1 rebar.config
View
@@ -10,7 +10,7 @@ clean: c_src_clean
$(REBAR) clean
c_src:
- cd c_src; $(MAKE) js
+ cd c_src; $(MAKE)
c_src_clean:
cd c_src; $(MAKE) clean
View
@@ -3,7 +3,7 @@
# not the system 'make' (eg. most non-linux UNIXes).
all:
- gmake all
+ @gmake all
verbose:
@gmake verbose
@@ -15,12 +15,12 @@ docs:
@gmake docs
c_src: FORCE
- gmake c_src
+ @gmake c_src
FORCE:
c_src_clean:
- gmake c_src_clean
+ @gmake c_src_clean
clean:
- gmake clean
+ @gmake 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 0f6c3cc

Please sign in to comment.