From f7e19a98fdf21f5d7bddacbea2f6a7e030cd32f5 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 6 Apr 2003 03:50:28 +0000 Subject: 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@ --- tools/build/Makefile.boot | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/build/Makefile.boot b/tools/build/Makefile.boot index e4899811d4a5..74c51196b71b 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 . +# 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}) -- cgit v1.3