From e3d7641b70900bc07105b20fef49b1ce608bd7cf Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Sat, 12 Apr 2003 15:07:46 +0000
Subject: 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
---
 tools/build/Makefile.boot    | 20 --------------------
 tools/build/mk/Makefile.boot | 14 ++++++++++++++
 tools/build/mk/bsd.lib.mk    |  4 ++++
 tools/build/mk/bsd.prog.mk   |  4 ++++
 4 files changed, 22 insertions(+), 20 deletions(-)
 delete mode 100644 tools/build/Makefile.boot
 create mode 100644 tools/build/mk/Makefile.boot
 create mode 100644 tools/build/mk/bsd.lib.mk
 create mode 100644 tools/build/mk/bsd.prog.mk

(limited to 'tools/build')

diff --git a/tools/build/Makefile.boot b/tools/build/Makefile.boot
deleted file mode 100644
index 4ad522e..0000000
--- a/tools/build/Makefile.boot
+++ /dev/null
@@ -1,20 +0,0 @@
-# $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}/legacy/usr/include
-DPADD=		${WORLDTMP}/legacy/usr/lib/libegacy.a
-LDADD=		-legacy
-LDFLAGS=	-L${WORLDTMP}/legacy/usr/lib
-
-OLD_MAKE_CONF?=	/etc/make.conf
-.if exists(${OLD_MAKE_CONF})
-.include "${OLD_MAKE_CONF}"
-.endif
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
new file mode 100644
index 0000000..ba2c5f7
--- /dev/null
+++ b/tools/build/mk/Makefile.boot
@@ -0,0 +1,14 @@
+# $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 ( ${BOOTSTRAPPING} < 440001 || \
+    ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500024 ))
+CFLAGS+=	-D__FBSDID=__RCSID
+.endif
+
+CFLAGS+=	-I${WORLDTMP}/legacy/usr/include
+DPADD+=		${WORLDTMP}/legacy/usr/lib/libegacy.a
+LDADD+=		-legacy
+LDFLAGS+=	-L${WORLDTMP}/legacy/usr/lib
diff --git a/tools/build/mk/bsd.lib.mk b/tools/build/mk/bsd.lib.mk
new file mode 100644
index 0000000..744f5b5
--- /dev/null
+++ b/tools/build/mk/bsd.lib.mk
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+.include "../../../share/mk/bsd.lib.mk"
+.include "Makefile.boot"
diff --git a/tools/build/mk/bsd.prog.mk b/tools/build/mk/bsd.prog.mk
new file mode 100644
index 0000000..d650665
--- /dev/null
+++ b/tools/build/mk/bsd.prog.mk
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+.include "../../../share/mk/bsd.prog.mk"
+.include "Makefile.boot"
-- 
cgit v1.1