From eafd028327cee688b54bc526e088c2a3b98f94e0 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 27 Jul 2023 05:10:43 +0100 Subject: [PATCH] Makefile: Automatically generate list of libcompat targets Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41179 --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4658a75986f9..22d088c8f2da 100644 --- a/Makefile +++ b/Makefile @@ -156,6 +156,8 @@ __DO_KERNELS?=yes .include "targets/Makefile" .else +.include "${.CURDIR}/share/mk/bsd.compat.pre.mk" + TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ check check-old check-old-dirs check-old-files check-old-libs \ checkdpadd checkworld clean cleandepend cleandir cleankernel \ @@ -172,7 +174,6 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ makeman sysent \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _build-metadata _cross-tools _includes _libraries \ - build32 distribute32 install32 \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ stage-packages stage-packages-kernel stage-packages-world \ @@ -181,6 +182,10 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ sign-packages package-pkg print-dir test-system-compiler test-system-linker \ test-includes +.for libcompat in ${_ALL_libcompats} +TGTS+= build${libcompat} distribute${libcompat} install${libcompat} +.endfor + # These targets require a TARGET and TARGET_ARCH be defined. XTGTS= native-xtools native-xtools-install xdev xdev-build xdev-install \ xdev-links @@ -201,12 +206,16 @@ TGTS+= ${BITGTS} # the interactive tty prompt. The safest route is to just whitelist # the ones that benefit from it. META_TGT_WHITELIST+= \ - _* build32 buildfiles buildincludes buildkernel \ + _* buildfiles buildincludes buildkernel \ buildworld everything kernel-toolchain kernel-toolchains kernel \ kernels libraries native-xtools showconfig test-includes \ test-system-compiler test-system-linker tinderbox toolchain \ toolchains universe universe-toolchain world worlds xdev xdev-build +.for libcompat in ${_ALL_libcompats} +META_TGT_WHITELIST+= build${libcompat} +.endfor + .ORDER: buildworld installworld .ORDER: buildworld distrib-dirs .ORDER: buildworld distribution