diff options
| author | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2010-09-08 19:53:16 +0000 |
|---|---|---|
| committer | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2010-09-08 19:53:16 +0000 |
| commit | 87ff4bceb6f207831d3f7b9d5cd9dce7f85869ef (patch) | |
| tree | a8eaaf3a9aeebd511cd8c02d536c7a22ed1fddf7 /Makefile.inc1 | |
| parent | 93dbfc78406da5ac59e05602c4ecc12be91e9ded (diff) | |
| download | src-87ff4bceb6f207831d3f7b9d5cd9dce7f85869ef.tar.gz src-87ff4bceb6f207831d3f7b9d5cd9dce7f85869ef.zip | |
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
Notes
Notes:
svn path=/head/; revision=212333
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ef732de99e24..a08e4ca7245e 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} |