diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2005-04-06 01:55:43 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2005-04-06 01:55:43 +0000 |
| commit | 39d2cd6f987e4b7862456533a4813787f47b16be (patch) | |
| tree | 8d9969ef995f6e5cded554706b9ccedc8df1d5d4 /Makefile.inc1 | |
| parent | 6459b7dabc20ee5d2b1581ef3924c91449150a57 (diff) | |
| download | src-39d2cd6f987e4b7862456533a4813787f47b16be.tar.gz src-39d2cd6f987e4b7862456533a4813787f47b16be.zip | |
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.
Notes
Notes:
svn path=/head/; revision=144701
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 6c8efc588b87..fdcfb0ac98cf 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 |