diff options
| author | marcel <marcel@FreeBSD.org> | 1999-12-11 17:05:36 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 1999-12-11 17:05:36 +0000 |
| commit | 2e7281ba86c2e2594e3465da18650c1478f632be (patch) | |
| tree | 28ca3053cf5d6283d1eb4f0f04e4a3fbd78162d8 /Makefile.inc1 | |
| parent | 287836faea1ff2f002f4c9ea357e87cb7f2b4cd6 (diff) | |
| download | FreeBSD-src-2e7281ba86c2e2594e3465da18650c1478f632be.zip FreeBSD-src-2e7281ba86c2e2594e3465da18650c1478f632be.tar.gz | |
Don't add MACHINE_ARCH to MAKEOBJDIRPREFIX when not cross-building.
This should fix make release.
Reported by: jhay, phk
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 67bfcfe..5b0b5b2 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} |
