Ruslan told me I should have quoted the arch strings when comparing to
MACHINE_ARCH. Belatedly get around to doing it.
This commit is contained in:
parent
193397f467
commit
f9faa1eb23
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=137560
@ -201,7 +201,7 @@ WMAKEENV= ${CROSSENV} \
|
||||
PATH=${TMPPATH}
|
||||
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
|
||||
|
||||
.if ${MACHINE_ARCH} == amd64
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
# 32 bit world
|
||||
LIB32TMP= ${OBJTREE}${.CURDIR}/lib32
|
||||
|
||||
@ -378,7 +378,7 @@ everything:
|
||||
@echo ">>> stage 4.4: building everything"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}cd ${.CURDIR}; ${WMAKE} par-all
|
||||
.if ${MACHINE_ARCH} == amd64
|
||||
.if ${MACHINE_ARCH} == "amd64"
|
||||
build32:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------"
|
||||
@ -436,7 +436,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 ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
|
||||
WMAKE_TGTS+= build32
|
||||
.endif
|
||||
|
||||
@ -569,7 +569,7 @@ reinstall: ${SPECIAL_INSTALLCHECKS}
|
||||
@echo ">>> Installing everything"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
|
||||
.if ${MACHINE_ARCH} == amd64 && defined(WITH_LIB32)
|
||||
.if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
|
||||
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
|
||||
.endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user