compiler-rt: switch from static PLIST to generated PLIST

the PLIST is target-specific and it's possible that files for multiple
targets are generated (this is the case on NetBSD/amd64). Since the
static PLIST can't support multiple targets currently, switch to a
generated one.

5 files changed, 4 insertions, 96 deletions

diff --git a/lang/compiler-rt/Makefile b/lang/compiler-rt/Makefile
index 62623233c94..f19599834b1 100644
--- a/lang/compiler-rt/Makefile
+++ b/lang/compiler-rt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/07/12 18:46:07 adam Exp $
+# $NetBSD: Makefile,v 1.18 2021/09/19 09:12:46 nia Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -33,17 +33,11 @@ CMAKE_ARGS+=	-DCOMPILER_RT_INSTALL_PATH:STRING=lib/clang/${PKGVERSION_NOREV}
 CMAKE_ARGS+=	-DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCOMPILER_RT_ENABLE_IOS=OFF
 
-PLIST_SUBST+=	COMPILER_RT_OS_DIR=${OS_DIR}
-PLIST_VARS+=	asan
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "SunOS"
-PLIST.asan=	yes
-.endif
-
 TEST_TARGET=	check-compiler-rt
 
+GENERATE_PLIST+=	find ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
+			sed 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
+
 PYTHON_FOR_BUILD_ONLY=	yes
 
 post-extract:
diff --git a/lang/compiler-rt/PLIST b/lang/compiler-rt/PLIST
deleted file mode 100644
index 1eeda7acb5b..00000000000
--- a/lang/compiler-rt/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2020/04/18 08:03:07 adam Exp $
-lib/clang/${PKGVERSION}/include/fuzzer/FuzzedDataProvider.h
-lib/clang/${PKGVERSION}/include/profile/InstrProfData.inc
-lib/clang/${PKGVERSION}/include/sanitizer/allocator_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/asan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/common_interface_defs.h
-lib/clang/${PKGVERSION}/include/sanitizer/coverage_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/dfsan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/hwasan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/linux_syscall_hooks.h
-lib/clang/${PKGVERSION}/include/sanitizer/lsan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/msan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/netbsd_syscall_hooks.h
-lib/clang/${PKGVERSION}/include/sanitizer/scudo_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface.h
-lib/clang/${PKGVERSION}/include/sanitizer/tsan_interface_atomic.h
-lib/clang/${PKGVERSION}/include/sanitizer/ubsan_interface.h
-lib/clang/${PKGVERSION}/include/xray/xray_interface.h
-lib/clang/${PKGVERSION}/include/xray/xray_log_interface.h
-lib/clang/${PKGVERSION}/include/xray/xray_records.h
-${PLIST.asan}lib/clang/${PKGVERSION}/share/asan_blacklist.txt
-${PLIST.asan}lib/clang/${PKGVERSION}/share/cfi_blacklist.txt
diff --git a/lang/compiler-rt/PLIST.Darwin b/lang/compiler-rt/PLIST.Darwin
deleted file mode 100644
index 4a8fc7ef76d..00000000000
--- a/lang/compiler-rt/PLIST.Darwin
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.4 2021/07/12 18:46:07 adam Exp $
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.asan_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.cc_kext.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_interceptors_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_no_main_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.fuzzer_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.lsan_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.profile_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.stats_client_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.stats_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_osx_dynamic.dylib
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.xray-basic_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.xray-fdr_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.xray-profiling_osx.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.xray_osx.a
diff --git a/lang/compiler-rt/PLIST.NetBSD b/lang/compiler-rt/PLIST.NetBSD
deleted file mode 100644
index cdfc50bd71d..00000000000
--- a/lang/compiler-rt/PLIST.NetBSD
+++ /dev/null
@@ -1,41 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.4 2021/07/12 18:46:07 adam Exp $
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-${MACHINE_ARCH}.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-preinit-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.builtins-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi_diag-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dd-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.dyndd-${MACHINE_ARCH}.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer_interceptors-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.fuzzer_no_main-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan_cxx-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.msan_cxx-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.profile-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.safestack-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats_client-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan_cxx-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.tsan_cxx-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-${MACHINE_ARCH}.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-${MACHINE_ARCH}.so
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-${MACHINE_ARCH}.a.syms
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-basic-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-fdr-${MACHINE_ARCH}.a
-lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.xray-profiling-${MACHINE_ARCH}.a
-${PLIST.asan}lib/clang/${PKGVERSION}/share/msan_blacklist.txt
diff --git a/lang/compiler-rt/PLIST.SunOS b/lang/compiler-rt/PLIST.SunOS
deleted file mode 100644
index ba61fd1018c..00000000000
--- a/lang/compiler-rt/PLIST.SunOS
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2018/12/17 16:19:52 jperkin Exp $
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-i386.a
-lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.builtins-x86_64.a