Attachment #222870 for bug #253727

View | Details | Raw Unified | Return to bug 253727
Collapse All | Expand All




BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
		TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \
		PATH=${BPATH}:${PATH} \
		LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
		WORLDTMP=${WORLDTMP} \
		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile

# kernel-tools stage
KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
		PATH=${BPATH}:${PATH} \
		LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
		WORLDTMP=${WORLDTMP} \
		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"


		fi; \
	    done); \
	if [ -z "${CROSSBUILD_HOST}" ] ; then \
		libs=$$(LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
		    while read line; do \
			set -- $$line; \
			if [ "$$2 $$3" != "not found" ]; then \

Return to bug 253727

Lines 717-722 BOOTSTRAPPING_OSRELDATE?=${OSRELDATE} Link Here

(-)b/Makefile.inc1 (-1 / +3 lines)
717	BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \	717	BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
718	TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \	718	TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \
719	PATH=${BPATH}:${PATH} \	719	PATH=${BPATH}:${PATH} \
		720	LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
720	WORLDTMP=${WORLDTMP} \	721	WORLDTMP=${WORLDTMP} \
721	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"	722	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
722	# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile	723	# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
Lines 764-769 XMAKE= ${BMAKE} \ Link Here
764	# kernel-tools stage	765	# kernel-tools stage
765	KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \	766	KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
766	PATH=${BPATH}:${PATH} \	767	PATH=${BPATH}:${PATH} \
		768	LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} \
767	WORLDTMP=${WORLDTMP} \	769	WORLDTMP=${WORLDTMP} \
768	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"	770	MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
769		771
Lines 1357-1363 distributeworld installworld stageworld: _installcheck_world .PHONY Link Here
1357	fi; \	1359	fi; \
1358	done); \	1360	done); \
1359	if [ -z "${CROSSBUILD_HOST}" ] ; then \	1361	if [ -z "${CROSSBUILD_HOST}" ] ; then \
1360	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null \| sort -u \| \	1362	libs=$$(LD_LIBRARY_PATH=${WORLDTMP}/lib:${WORLDTMP}/usr/lib:${LD_LIBRARY_PATH} ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null \| sort -u \| \
1361	while read line; do \	1363	while read line; do \
1362	set -- $$line; \	1364	set -- $$line; \
1363	if [ "$$2 $$3" != "not found" ]; then \	1365	if [ "$$2 $$3" != "not found" ]; then \