mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Ruslan told me I should have quoted the arch strings when comparing to

Browse Source 
MACHINE_ARCH.  Belatedly get around to doing it.
This commit is contained in:
Peter Wemm 2004-11-10 23:38:00 +00:00
parent 193397f467
commit f9faa1eb23
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=137560
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

@ -201,7 +201,7 @@ WMAKEENV= ${CROSSENV} \
PATH=${TMPPATH} PATH=${TMPPATH}
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
.if ${MACHINE_ARCH} == amd64 .if ${MACHINE_ARCH} == "amd64"
# 32 bit world # 32 bit world
LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32
@ -378,7 +378,7 @@ everything:
@echo ">>> stage 4.4: building everything" @echo ">>> stage 4.4: building everything"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${WMAKE} par-all ${_+_}cd ${.CURDIR}; ${WMAKE} par-all
.if ${MACHINE_ARCH} == amd64 .if ${MACHINE_ARCH} == "amd64"
build32: build32:
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@ -436,7 +436,7 @@ WMAKE_TGTS+= _cleanobj _obj _build-tools
WMAKE_TGTS+= _cross-tools WMAKE_TGTS+= _cross-tools
.endif .endif
WMAKE_TGTS+= _includes _libraries _depend everything WMAKE_TGTS+= _includes _libraries _depend everything
.if ${MACHINE_ARCH} == amd64 && defined(WITH_LIB32) .if ${MACHINE_ARCH} == "amd64" && defined(WITH_LIB32)
WMAKE_TGTS+= build32 WMAKE_TGTS+= build32
.endif .endif
@ -569,7 +569,7 @@ reinstall: ${SPECIAL_INSTALLCHECKS}
@echo ">>> Installing everything" @echo ">>> Installing everything"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install ${_+_}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 ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif .endif