summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-04-06 03:50:28 +0000
committerimp <imp@FreeBSD.org>2003-04-06 03:50:28 +0000
commit070e2898a0d5f648b496f43ba5c351da5da0ce0d (patch)
tree0128e1de37ab3a9e197591b92d968f4c930a3c88 /tools
parentb7e83c7b416e2f1f5291659e8c25e5ef7d37633b (diff)
downloadFreeBSD-src-070e2898a0d5f648b496f43ba5c351da5da0ce0d.zip
FreeBSD-src-070e2898a0d5f648b496f43ba5c351da5da0ce0d.tar.gz
We can't use ${WORLDTMP}/usr/{include,lib} for the compat layer. This
is because we populate these directories later, and a subsequent -DNOCLEAN build may fail. So, we put them in ${WORLDTMP}/build/usr/{include,lib} instead and adjust Makefile.boot. Again, this works on -stable and -current, but might break older versions. Submitted by: ru@
Diffstat (limited to 'tools')
-rw-r--r--tools/build/Makefile.boot8
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/build/Makefile.boot b/tools/build/Makefile.boot
index e489981..74c51196 100644
--- a/tools/build/Makefile.boot
+++ b/tools/build/Makefile.boot
@@ -1,16 +1,18 @@
# $FreeBSD$
# FreeBSD didn't always have the __FBSDID() macro in <sys/cdefs.h>.
+# We could do this with a sys/cdefs.h wrapper, but given that this would
+# slow down all new builds for such a simple concept, we do it here.
.if defined(BOOTSTRAPPING) && \
( ${BOOTSTRAPPING} < 440001 || \
( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500024 ))
CFLAGS+= -D__FBSDID=__RCSID
.endif
-CFLAGS+= -I${WORLDTMP}/usr/include
-DPADD= ${WORLDTMP}/usr/lib/libbuild.a
+CFLAGS+= -I${WORLDTMP}/build/usr/include
+DPADD= ${WORLDTMP}/build/usr/lib/libbuild.a
LDADD= -lbuild
-LDFLAGS= -L${WORLDTMP}/usr/lib
+LDFLAGS= -L${WORLDTMP}/build/usr/lib
OLD_MAKE_CONF?= /etc/make.conf
.if exists(${OLD_MAKE_CONF})
OpenPOWER on IntegriCloud