summaryrefslogtreecommitdiffstats
path: root/stage3
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2012-07-13 16:56:07 -0400
committerDJ Delorie <dj@delorie.com>2012-07-13 16:56:07 -0400
commit1e3ee0bc8449943547032e204b6a4542e9702cea (patch)
tree7eb33413d63f4f3737cbdf8634eb1b28db5e9ed5 /stage3
parentd43d628c65e7d35caab1c1fe7ece27b53954040f (diff)
downloadbootstrap.git.DONOTUSE-1e3ee0bc8449943547032e204b6a4542e9702cea.tar.gz
bootstrap.git.DONOTUSE-1e3ee0bc8449943547032e204b6a4542e9702cea.tar.xz
bootstrap.git.DONOTUSE-1e3ee0bc8449943547032e204b6a4542e9702cea.zip
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.
Diffstat (limited to 'stage3')
-rwxr-xr-xstage310
1 files changed, 5 insertions, 5 deletions
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
}