d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix AMD64 cross-builds when WITH_LIB32 is defined.

Browse Source 
(Initially spotted by kris@ on RELENG_5.)
This commit is contained in:
Ruslan Ermilov 2005-03-27 19:35:09 +00:00
parent 68d6faa840
commit 6eb46c30aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -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