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/*.
This commit is contained in:
parent
0e202e40d7
commit
090fc16472
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=36423
7
Makefile
7
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
|
# While porting to the another architecture include the bootstrap instead
|
||||||
# of the normal build.
|
# of the normal build.
|
||||||
@ -208,14 +208,15 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
|
|||||||
# want that - all compile-time library paths should be resolved by gcc.
|
# want that - all compile-time library paths should be resolved by gcc.
|
||||||
# It fails for set[ug]id executables (are any used?).
|
# It fails for set[ug]id executables (are any used?).
|
||||||
COMPILER_ENV= BISON_SIMPLE=${WORLDTMP}/usr/share/misc/bison.simple \
|
COMPILER_ENV= BISON_SIMPLE=${WORLDTMP}/usr/share/misc/bison.simple \
|
||||||
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
|
|
||||||
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
|
COMPILER_PATH=${WORLDTMP}/usr/libexec:${WORLDTMP}/usr/bin \
|
||||||
GCC_EXEC_PREFIX=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib/ \
|
GCC_EXEC_PREFIX=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib/ \
|
||||||
LD_LIBRARY_PATH=${WORLDTMP}${SHLIBDIR} \
|
LD_LIBRARY_PATH=${WORLDTMP}${SHLIBDIR} \
|
||||||
LIBRARY_PATH=${WORLDTMP}${SHLIBDIR}:${WORLDTMP}/usr/lib
|
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} \
|
XMAKEENV= PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
|
||||||
|
OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \
|
||||||
CFLAGS="-nostdinc ${CFLAGS}" # XXX -nostdlib
|
CFLAGS="-nostdinc ${CFLAGS}" # XXX -nostdlib
|
||||||
|
|
||||||
# used to compile and install 'make' in temporary build tree
|
# used to compile and install 'make' in temporary build tree
|
||||||
|
Loading…
Reference in New Issue
Block a user