Merge from RELENG_5: invert WITH_LIB32 into NO_LIB32 so that we build the

32 bit libraries by default.  Define NO_LIB32 in make.conf if you do not
want this.
This commit is contained in:
Peter Wemm 2005-04-06 01:55:43 +00:00
parent 6459b7dabc
commit 39d2cd6f98
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=144701

View File

@ -455,7 +455,7 @@ WMAKE_TGTS+= _cleanobj _obj _build-tools
WMAKE_TGTS+= _cross-tools
.endif
WMAKE_TGTS+= _includes _libraries _depend everything
.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32)
.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
WMAKE_TGTS+= build32
.endif
@ -541,7 +541,7 @@ reinstall: ${SPECIAL_INSTALLCHECKS}
@echo ">>> Installing everything"
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
.if ${TARGET_ARCH} == "amd64" && defined(WITH_LIB32)
.if ${TARGET_ARCH} == "amd64" && !defined(NO_LIB32)
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif