From 5dab131339420a84be4163e539318a607ba6a063 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 15 Oct 2019 21:22:13 +0000
Subject: [PATCH] Build compat libraries before "everything".

This is required for us to link programs against compat versions of
libraries.

Reviewed by:	bdrewery, jhb
Sponsored by:	DARPA, AFRL
---
 Makefile.inc1      | 4 ++--
 Makefile.libcompat | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 14c50bb468c3..8eb85f0e12dd 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1150,7 +1150,7 @@ _libraries:
 everything: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 4.3: building everything"
+	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
 
@@ -1171,10 +1171,10 @@ WMAKE_TGTS+=	_includes
 .if !defined(NO_LIBS)
 WMAKE_TGTS+=	_libraries
 .endif
-WMAKE_TGTS+=	everything
 .if defined(_LIBCOMPAT) && empty(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	build${libcompat}
 .endif
+WMAKE_TGTS+=	everything
 
 # record buildworld time in seconds
 .if make(buildworld)
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 2616ddd2b21a..6481ba73ddd1 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -61,7 +61,7 @@ _jevents=	lib/libpmc/pmu-events
 build${libcompat}: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 5.1: building lib${libcompat} shim libraries"
+	@echo ">>> stage 4.3: building lib${libcompat} shim libraries"
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${LIBCOMPATTMP}