svn commit: r212333 - head

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Sep  8 19:53:16 2010
New Revision: 212333
URL: http://svn.freebsd.org/changeset/base/212333

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Sep  8 19:50:47 2010	(r212332)
+++ head/Makefile.inc1	Wed Sep  8 19:53:16 2010	(r212333)
@@ -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}