From 1e3ee0bc8449943547032e204b6a4542e9702cea Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@delorie.com>
Date: Fri, 13 Jul 2012 16:56:07 -0400
Subject: move some vars out of make command line

Setting environment variables on the MAKE command line overrides those
variables being set elsewhere, which messed up libsepol.  Set those in
the environment instead.
---
 stage3 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'stage3')

diff --git a/stage3 b/stage3
index 9456c74..6535ea1 100755
--- a/stage3
+++ b/stage3
@@ -52,14 +52,14 @@ scriptmake()
 {
     export HOME=/stage3
     test -d $TOP/stage3.mk || mkdir -p $TOP/stage3.mk
-    make -f $MYDIR/script2makefile \
-	SCRIPTDIR=$TOP/stage3.d \
-	FRAGDIR=$TOP/stage3.mk \
-	RCFILE=$TOP/macros.bashrc \
-	SRC="$SRC" \
+    SRC="$SRC" \
 	J="$J" \
 	BUILDDIR="$BUILDDIR" \
 	TARGET="$TARGET" \
+	make -f $MYDIR/script2makefile \
+	RCFILE=$TOP/macros.bashrc \
+	SCRIPTDIR=$TOP/stage3.d \
+	FRAGDIR=$TOP/stage3.mk \
 	$1
 }
 
-- 
cgit