aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>1999-12-11 17:05:36 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>1999-12-11 17:05:36 +0000
commit3f2aa30a37a8e7baa733a9ae4b6ba7088185c296 (patch)
treef03456c469a0cb055b143a7ab18735fee1535a0c /Makefile.inc1
parent6bdfe06ad9337a33a402bc933006265c30980780 (diff)
downloadsrc-3f2aa30a37a8e7baa733a9ae4b6ba7088185c296.tar.gz
src-3f2aa30a37a8e7baa733a9ae4b6ba7088185c296.zip
Don't add MACHINE_ARCH to MAKEOBJDIRPREFIX when not cross-building.
This should fix make release. Reported by: jhay, phk
Notes
Notes: svn path=/head/; revision=54445
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc14
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 67bfcfe1ccdb..5b0b5b2e07e0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -107,7 +107,11 @@ SUPFLAGS?= -g -L 2 -P -
MAKEOBJDIRPREFIX?= /usr/obj
BUILD_ARCH!= sysctl -n hw.machine_arch
+.if ${BUILD_ARCH} == ${MACHINE_ARCH}
+OBJTREE= ${MAKEOBJDIRPREFIX}
+.else
OBJTREE= ${MAKEOBJDIRPREFIX}/${MACHINE_ARCH}
+.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH}
STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin
TMPPATH= ${STRICTTMPPATH}:${PATH}