diff options
| author | ru <ru@FreeBSD.org> | 2001-09-21 08:17:48 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2001-09-21 08:17:48 +0000 |
| commit | a9fda568865e417b5da861fbacc5f73d6fa0258b (patch) | |
| tree | f16a2c71746a8f9300e30524f622d77a950b8ecd | |
| parent | 6137f71e4ca1a40b5019a7a7a8570a610a3a3b53 (diff) | |
| download | FreeBSD-src-a9fda568865e417b5da861fbacc5f73d6fa0258b.zip FreeBSD-src-a9fda568865e417b5da861fbacc5f73d6fa0258b.tar.gz | |
When bootstrapping (build-tools and cross-tools), avoid
including the ${WORLDTMP}/usr/include headers that may
not match the installed host libraries.
This should fix the 20010919 UPDATING entry.
| -rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 104cdc9..ffe529a 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -37,7 +37,7 @@ SHLIB_NAME?= lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif .endif -.if defined(DESTDIR) +.if defined(DESTDIR) && !defined(BOOTSTRAPPING) CFLAGS+= -I${DESTDIR}/usr/include CXXINCLUDES+= -I${DESTDIR}/usr/include/g++ .endif diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index b0133f4..4c790c2 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -11,7 +11,7 @@ __initialized__: .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S CFLAGS+=${COPTS} ${DEBUG_FLAGS} -.if defined(DESTDIR) +.if defined(DESTDIR) && !defined(BOOTSTRAPPING) CFLAGS+= -I${DESTDIR}/usr/include CXXINCLUDES+= -I${DESTDIR}/usr/include/g++ .endif |
