svn commit: r353595 - head

[Brooks Davis]

Author: brooks
Date: Tue Oct 15 21:22:13 2019
New Revision: 353595
URL: https://svnweb.freebsd.org/changeset/base/353595

Log:
  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

Modified:
  head/Makefile.inc1
  head/Makefile.libcompat

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 15 21:15:03 2019	(r353594)
+++ head/Makefile.inc1	Tue Oct 15 21:22:13 2019	(r353595)
@@ -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)

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Tue Oct 15 21:15:03 2019	(r353594)
+++ head/Makefile.libcompat	Tue Oct 15 21:22:13 2019	(r353595)
@@ -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}