summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2010-09-08 19:53:16 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2010-09-08 19:53:16 +0000
commit50efad9eda653af31eed649d681d586956d14272 (patch)
treea8eaaf3a9aeebd511cd8c02d536c7a22ed1fddf7 /Makefile.inc1
parentbaa1b2ead9f286d654cb83e970e87b92fd08f5e4 (diff)
downloadFreeBSD-src-50efad9eda653af31eed649d681d586956d14272.zip
FreeBSD-src-50efad9eda653af31eed649d681d586956d14272.tar.gz
Check TARGET_ARCH as well as TARGET to determine if we are doing a cross
build. This is necessary to be able to cross-build 32-bit PowerPC from a 64-bit PowerPC host. Reviewed by: imp
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index ef732de..a08e4ca 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -161,7 +161,7 @@ BUILD_ARCH!= uname -p
.error To cross-build, set TARGET_ARCH.
.endif
.endif
-.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING)
+.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
OBJTREE= ${MAKEOBJDIRPREFIX}
.else
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
OpenPOWER on IntegriCloud