summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-04-12 15:07:46 +0000
committerru <ru@FreeBSD.org>2003-04-12 15:07:46 +0000
commite3d7641b70900bc07105b20fef49b1ce608bd7cf (patch)
treea061d9437cad94efb4e5243de5e109a66a3e8c47 /Makefile.inc1
parent05640161f6a5a16c53067de7bb81d2e113d3e11c (diff)
downloadFreeBSD-src-e3d7641b70900bc07105b20fef49b1ce608bd7cf.zip
FreeBSD-src-e3d7641b70900bc07105b20fef49b1ce608bd7cf.tar.gz
Make sure legacy stuff comes last. Some tools that use
legacy stuff (binutils) depend on this order. For this to work, provide (and use) specialized versions of bsd.prog.mk and bsd.lib.mk that include the standard versions first, then augment CFLAGS, DPADD, LDADD, and LDFLAGS as necessary, with the legacy stuff. Tested on: 4.0-RELEASE
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc15
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6b6a170..b74da18 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -193,9 +193,8 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
# bootstrap-tools stage
BMAKEENV= DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
- __MAKE_CONF=${.CURDIR}/tools/build/Makefile.boot \
- OLD_MAKE_CONF=${__MAKE_CONF} \
- WORLDTMP=${WORLDTMP}
+ WORLDTMP=${WORLDTMP} \
+ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
BOOTSTRAPPING=${OSRELDATE} \
OpenPOWER on IntegriCloud