[src/trunk]: src/external/bsd/compiler_rt/lib/clang/lib/netbsd compiler_rt: g...

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e2dd536b4ad
branches:  trunk
changeset: 983046:6e2dd536b4ad
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Apr 30 22:48:37 2021 +0000

description:
compiler_rt: generate symbol table early

These libraries have the special feature that they install both the .a
library as well as the .a.syms that is generated from them.  To avoid
the transformation rule .a.a.syms to apply to the files in ${DESTDIR},
that rule has to be disabled during the installation phase.

If the transformation rule were active during installation, the .a.syms
file in ${DESTDIR} would have more than one possible source file, which
eventually leads to an error during installation since in the command
"install a b c", the last argument must be a directory, not a file.

The installation phase should be as minimal as possible anyway,
therefore move the generation of the .syms files to the build phase.

This hopefully fixes the build for HAVE_LLVM=yes, which has been broken
for several weeks now, at least for the official builds.

diffstat:

 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile                 |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile             |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile                 |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile             |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile                 |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile             |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile        |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile     |  4 ++--
 external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile |  4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diffs (162 lines):

diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan-m64/Makefile   Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -57,7 +57,7 @@
 SYMS=          libclang_rt.asan-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/asan/asan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile       Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/asan_cxx-m64/Makefile       Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -40,7 +40,7 @@
 SYMS=          libclang_rt.asan_cxx-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/asan/asan.syms.extra # Overlooked in upstream compiler-rt (8.0) ?
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan-m64/Makefile   Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -52,7 +52,7 @@
 SYMS=          libclang_rt.msan-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/msan/msan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile       Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/msan_cxx-m64/Makefile       Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:40 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -41,7 +41,7 @@
 SYMS=          libclang_rt.msan_cxx-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/msan/msan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile   Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan-m64/Makefile   Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -52,7 +52,7 @@
 SYMS=          libclang_rt.tsan-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile       Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/tsan_cxx-m64/Makefile       Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:37 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -40,7 +40,7 @@
 SYMS=          libclang_rt.tsan_cxx-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/tsan/rtl/tsan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile  Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_minimal-m64/Makefile  Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:38 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -36,7 +36,7 @@
 SYMS=          libclang_rt.ubsan_minimal-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/ubsan_minimal/ubsan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile       Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone-m64/Makefile       Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:38 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -50,7 +50,7 @@
 SYMS=          libclang_rt.ubsan_standalone-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}
diff -r 853bf8b08f46 -r 6e2dd536b4ad external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile   Fri Apr 30 22:22:49 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/ubsan_standalone_cxx-m64/Makefile   Fri Apr 30 22:48:37 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/08/30 23:36:41 kamil Exp $
+#      $NetBSD: Makefile,v 1.5 2021/04/30 22:48:38 rillig Exp $
 
 NOSANITIZER=    # defined
 
@@ -36,7 +36,7 @@
 SYMS=          libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 SYMS_EXTRA=    ${TOPDIR}/lib/ubsan/ubsan.syms.extra
 
-beforeinstall: ${SYMS}
+all:           ${SYMS}
 
 CLEANFILES+=   ${SYMS}
 FILES=         ${SYMS}