diff options
author | peter <peter@FreeBSD.org> | 2005-04-06 01:55:43 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2005-04-06 01:55:43 +0000 |
commit | 37b92090cfa2d45e70e9ac612529b298081d3c5a (patch) | |
tree | 8d9969ef995f6e5cded554706b9ccedc8df1d5d4 | |
parent | b2c2916bfaa5e67c5c32fc7d6d8a56899ebbb351 (diff) | |
download | FreeBSD-src-37b92090cfa2d45e70e9ac612529b298081d3c5a.zip FreeBSD-src-37b92090cfa2d45e70e9ac612529b298081d3c5a.tar.gz |
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.
-rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6c8efc5..fdcfb0a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |