Don't add MACHINE_ARCH to MAKEOBJDIRPREFIX when not cross-building.

This should fix make release.

Reported by: jhay, phk
This commit is contained in:
Marcel Moolenaar 1999-12-11 17:05:36 +00:00
parent 6bdfe06ad9
commit 3f2aa30a37
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=54445

View File

@ -107,7 +107,11 @@ SUPFLAGS?= -g -L 2 -P -
MAKEOBJDIRPREFIX?= /usr/obj MAKEOBJDIRPREFIX?= /usr/obj
BUILD_ARCH!= sysctl -n hw.machine_arch BUILD_ARCH!= sysctl -n hw.machine_arch
.if ${BUILD_ARCH} == ${MACHINE_ARCH}
OBJTREE= ${MAKEOBJDIRPREFIX}
.else
OBJTREE= ${MAKEOBJDIRPREFIX}/${MACHINE_ARCH} OBJTREE= ${MAKEOBJDIRPREFIX}/${MACHINE_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH} WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH}
STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin
TMPPATH= ${STRICTTMPPATH}:${PATH} TMPPATH= ${STRICTTMPPATH}:${PATH}