Page MenuHomeFreeBSD
Files F151017375

D874.diff
No OneTemporary
Actions

D874.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -183,12 +183,9 @@
.error To cross-build, set TARGET_ARCH.
.endif
.endif
-.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
-OBJTREE= ${MAKEOBJDIRPREFIX}
-.else
-OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
-.endif
-WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
+
+OBJTREE= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}
+WORLDTMP= ${OBJTREE}/tmp
BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
STRICTTMPPATH= ${BPATH}:${XPATH}
@@ -400,8 +397,8 @@
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
# 32 bit world
-LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32
-LIB32TMP= ${OBJTREE}${.CURDIR}/lib32
+LIB32_OBJTREE= ${OBJTREE}/world32
+LIB32TMP= ${OBJTREE}/lib32
.if ${TARGET_ARCH} == "amd64"
.if empty(TARGET_CPUTYPE)
@@ -523,9 +520,9 @@
.else
rm -rf ${WORLDTMP}/legacy/usr/include
# XXX - These three can depend on any header file.
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
- rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
+ rm -f ${OBJTREE}/usr.bin/kdump/ioctl.c
+ rm -f ${OBJTREE}/usr.bin/kdump/kdump_subr.c
+ rm -f ${OBJTREE}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
lib usr legacy/bin legacy/usr
@@ -1236,6 +1233,7 @@
@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
false
.endif
+# Note that MAKEOBJDIRPREFIX here is actually the parent make's WORLDTMP.
.for _tool in tools/build
${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
cd ${.CURDIR}/${_tool} && \
@@ -1451,9 +1449,9 @@
# kernel-tools: Build kernel-building tools
#
kernel-tools: .MAKE
- mkdir -p ${MAKEOBJDIRPREFIX}/usr
+ mkdir -p ${OBJTREE}/usr
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
- -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+ -p ${OBJTREE}/usr >/dev/null
#
# cross-tools: All the tools needed to build the rest of the system after
@@ -2086,7 +2084,7 @@
.error XDTP variable should be an absolute path
.endif
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+CDBENV=MAKEOBJDIRPREFIX=${OBJTREE}/${XDDIR} \
INSTALL="sh ${.CURDIR}/tools/install.sh"
CDENV= ${CDBENV} \
_SHLIBDIRPREFIX=${XDDESTDIR} \
@@ -2098,7 +2096,7 @@
CPP="${CPP} ${CD2CFLAGS}" \
MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
-CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
+CDTMP= ${OBJTREE}/${XDDIR}/${.CURDIR}/tmp
CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
XDDESTDIR=${DESTDIR}/${XDTP}

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 6, 11:46 AM (14 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30894551
Default Alt Text
D874.diff (2 KB)

Event Timeline