From a6919ef89d5da3a3ce3ec8b990122e83621a0df0 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Fri, 8 May 1998 21:29:35 +0000
Subject: [PATCH] Fix the problem people are having building -current on a
 -stable system. The headers that are installed in WORLDTMP are part of the
 interface that includes libraries like libc, so they must be installed
 together. This means that lib-tools and build-tools should be merged. The
 FreeBSD build only works in hosted form where it is assumed that the
 installed version contains adequate tools to build the latest release.

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 68d6fc6aabe4..392123be7495 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.173 1998/04/27 16:21:33 bde Exp $
+#	$Id: Makefile,v 1.174 1998/05/02 12:29:48 bde Exp $
 #
 # While porting to the another architecture include the bootstrap instead
 # of the normal build.
@@ -293,18 +293,18 @@ buildworld:
 	@echo " Rebuilding ${DESTDIR}/usr/include"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR} && SHARED=symlinks ${BMAKE} includes
-.if !defined(NOTOOLS)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Rebuilding tools needed to build the bootstrap libraries"
-	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR} && ${BMAKE} lib-tools
-.endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo " Rebuilding bootstrap libraries"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR} && ${BMAKE} bootstrap-libraries
+.if !defined(NOTOOLS)
+	@echo
+	@echo "--------------------------------------------------------------"
+	@echo " Rebuilding tools needed to build libraries"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR} && ${BMAKE} lib-tools
+.endif
 .if !defined(NOTOOLS)
 	@echo
 	@echo "--------------------------------------------------------------"