From 87ff4bceb6f207831d3f7b9d5cd9dce7f85869ef Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 8 Sep 2010 19:53:16 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index ef732de99e2..a08e4ca7245 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}