d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install bootstrap-tools into a separate subtree of ${WORLDTMP}.

Browse Source 
This allows us to use them as early as possible while building
bootstrap-, build-, and cross-tools.  Some cleanups to follow.

This change resolves the gperf(1) bootstrapping issue (missing
-E option) in gnu/usr.bin/cc/cc1plus while in the cross-tools
stage when upgrading from 4.0-RELEASE.
This commit is contained in:
Ruslan Ermilov 2003-04-13 11:42:55 +00:00
parent a9198bad37
commit ad1520bdf4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.inc1
View File

@ -151,7 +151,9 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}
.endif .endif
WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
# /usr/games added for fortune which depend on strfile # /usr/games added for fortune which depend on strfile
STRICTTMPPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH} TMPPATH= ${STRICTTMPPATH}:${PATH}
INSTALLTMP!= /usr/bin/mktemp -d -u -t install INSTALLTMP!= /usr/bin/mktemp -d -u -t install
@ -186,13 +188,14 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
MACHINE_ARCH=${TARGET_ARCH} \ MACHINE_ARCH=${TARGET_ARCH} \
MACHINE=${TARGET} \ MACHINE=${TARGET} \
CPUTYPE=${TARGET_CPUTYPE} \ CPUTYPE=${TARGET_CPUTYPE} \
GROFF_BIN_PATH=${WORLDTMP}/usr/bin \ GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \ GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
GROFF_TMAC_PATH=${WORLDTMP}/usr/share/tmac GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
# bootstrap-tools stage # bootstrap-tools stage
BMAKEENV= DESTDIR= \ BMAKEENV= DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} \ WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
@ -274,7 +277,7 @@ _worldtmp:
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif .endif
.for _dir in ${USRDIRS} .for _dir in ${USRDIRS}
mkdir -p ${WORLDTMP}/${_dir} mkdir -p ${WORLDTMP}/${_dir} ${WORLDTMP}/legacy/${_dir}
.endfor .endfor
.for _dir in ${INCDIRS} .for _dir in ${INCDIRS}
mkdir -p ${WORLDTMP}/usr/include/${_dir} mkdir -p ${WORLDTMP}/usr/include/${_dir}
@ -648,7 +651,7 @@ bootstrap-tools:
${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ depend; \
${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ all; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
.endfor .endfor
# #