From 0a3b4d40de2e185f31aea0754ffef7b4537b5ea4 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Sun, 27 Mar 2005 19:35:09 +0000
Subject: Fix AMD64 cross-builds when WITH_LIB32 is defined.

(Initially spotted by kris@ on RELENG_5.)
---
 Makefile.inc1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index b10bbde..eb5f56b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -205,7 +205,7 @@ WMAKEENV=	${CROSSENV} \
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
-.if ${MACHINE_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "amd64"
 # 32 bit world
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
@@ -382,7 +382,7 @@ everything:
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
-.if ${MACHINE_ARCH} == "amd64"
+.if ${TARGET_ARCH} == "amd64"
 build32:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -454,7 +454,7 @@ WMAKE_TGTS+=	_cleanobj _obj _build-tools
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
-.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
+.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32)
 WMAKE_TGTS+=	build32
 .endif
 
@@ -540,7 +540,7 @@ reinstall: ${SPECIAL_INSTALLCHECKS}
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
-.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
+.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32)
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
-- 
cgit v1.1