diff options
| author | ru <ru@FreeBSD.org> | 2005-11-19 06:45:44 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2005-11-19 06:45:44 +0000 |
| commit | 93ebc2479ab2d52b448b71117009357e91166571 (patch) | |
| tree | bb370e40e0c7c1ab0f22e1dbf77b3d38321b1482 | |
| parent | d7ead39c6503e28aa3a048ddebe9985e56db66a0 (diff) | |
| download | FreeBSD-src-93ebc2479ab2d52b448b71117009357e91166571.zip FreeBSD-src-93ebc2479ab2d52b448b71117009357e91166571.tar.gz | |
Add the NO_INCS knob to bsd.prog.mk and bsd.lib.mk to not include
bsd.incs.mk, and use it when installing 32-bit compat libraries
on amd64. This causes it to *not* overwrite native headers with
i386 versions, which was the case with <fenv.h> and <vgl.h>.
PR: amd64/83806
Prodded by: bde
MFC after: 1 week
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e35e3c4..5878f98 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -237,7 +237,7 @@ LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ -DNO_BIND -DNO_MAN -DNO_NLS -DNO_INFO -DNO_HTML -LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} +LIB32IMAKE= ${LIB32MAKE:NINSTALL=*} -DNO_INCS .endif # install stage diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index c60c133..71e474a 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -244,7 +244,9 @@ _libinstall: .include <bsd.nls.mk> .include <bsd.files.mk> +.if !defined(NO_INCS) .include <bsd.incs.mk> +.endif .include <bsd.links.mk> .if !defined(NO_MAN) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 3b4d092..ebe2a01 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -174,7 +174,9 @@ NLSNAME?= ${PROG} .include <bsd.nls.mk> .include <bsd.files.mk> +.if !defined(NO_INCS) .include <bsd.incs.mk> +.endif .include <bsd.links.mk> .if !defined(NO_MAN) |
