summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1998-05-27 16:33:43 +0000
committerpeter <peter@FreeBSD.org>1998-05-27 16:33:43 +0000
commit53e563399c75124fe7a4993fe474d4b620d6d8f8 (patch)
treea722652eba81a5871c15ffa2d49f23979ced5262 /Makefile
parent815e5f2dfa925c6a2e5870dad8906251410fc9f1 (diff)
downloadFreeBSD-src-53e563399c75124fe7a4993fe474d4b620d6d8f8.zip
FreeBSD-src-53e563399c75124fe7a4993fe474d4b620d6d8f8.tar.gz
On the other hand, when /usr/bin/as is really a link to objformat, it's not
helpful to stop it running /usr/libexec/aout/as for real while bootstrapping. Only force a strict path when we really have built all the tools in $OBJDIR/tmp/usr/libexec/*.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 31f576b..7f2e4c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.182 1998/05/27 07:59:31 sos Exp $
+# $Id: Makefile,v 1.183 1998/05/27 15:40:35 peter Exp $
#
# While porting to the another architecture include the bootstrap instead
# of the normal build.
@@ -208,14 +208,15 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
# want that - all compile-time library paths should be resolved by gcc.
# It fails for set[ug]id executables (are any used?).
COMPILER_ENV= BISON_SIMPLE=${WORLDTMP}/usr/share/misc/bison.simple \
- OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
GCC_EXEC_PREFIX=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib/ \
LD_LIBRARY_PATH=${WORLDTMP}${SHLIBDIR} \
LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib
-BMAKEENV= PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t
+BMAKEENV= PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t \
+ OBJFORMAT_PATH=${WORLDTMP}/usr/libexec:/usr/libexec
XMAKEENV= PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
+ OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
CFLAGS="-nostdinc ${CFLAGS}" # XXX -nostdlib
# used to compile and install 'make' in temporary build tree
OpenPOWER on IntegriCloud