[src/trunk]: src/external/bsd/compiler_rt centralize version handling

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

details:   https://anonhg.NetBSD.org/src/rev/3af5a1ba5c93
branches:  trunk
changeset: 1023675:3af5a1ba5c93
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 21 20:34:37 2021 +0000

description:
centralize version handling

diffstat:

 external/bsd/compiler_rt/Makefile.inc                         |   6 ++++++
 external/bsd/compiler_rt/lib/Makefile.inc                     |   2 ++
 external/bsd/compiler_rt/lib/clang/Makefile.inc               |   2 ++
 external/bsd/compiler_rt/lib/clang/include/Makefile.inc       |   2 ++
 external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile |  10 ++++------
 external/bsd/compiler_rt/lib/clang/include/xray/Makefile      |  10 ++++------
 external/bsd/compiler_rt/lib/clang/lib/Makefile.inc           |   2 ++
 external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc    |   2 ++
 external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk       |   9 ++-------
 external/bsd/compiler_rt/lib/clang/share/Makefile             |   9 +++------
 10 files changed, 29 insertions(+), 25 deletions(-)

diffs (133 lines):

diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/Makefile.inc     Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+
+TOPDIR:=       ${.PARSEDIR}/../../../sys/external/bsd/compiler_rt/dist
+COMPILER_RT:=  ${.PARSEDIR}
+
+CLANG_VER!=    cd ${COMPILER_RT}/../../apache2/llvm && ${MAKE} -V LLVM_VERSION
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/lib/Makefile.inc Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/lib/clang/Makefile.inc   Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/include/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/lib/clang/include/Makefile.inc   Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
--- a/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile     Tue Sep 21 15:56:55 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile     Tue Sep 21 20:34:37 2021 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.3 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+#      $NetBSD: Makefile,v 1.4 2021/09/21 20:34:37 christos Exp $
 
 NOOBJ= # defined
 
+.include <bsd.init.mk>
+
 .PATH: ${TOPDIR}/include/sanitizer
 
 INCS+= allocator_interface.h
@@ -20,8 +20,6 @@
 INCS+= tsan_interface.h
 INCS+= tsan_interface_atomic.h
 
-.include <bsd.own.mk>
-
-INCSDIR=       /usr/lib/clang/9.0.0/include/sanitizer
+INCSDIR=       /usr/lib/clang/${CLANG_VER}/include/sanitizer
 
 .include <bsd.prog.mk>
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/include/xray/Makefile
--- a/external/bsd/compiler_rt/lib/clang/include/xray/Makefile  Tue Sep 21 15:56:55 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/include/xray/Makefile  Tue Sep 21 20:34:37 2021 +0000
@@ -1,17 +1,15 @@
-#      $NetBSD: Makefile,v 1.2 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+#      $NetBSD: Makefile,v 1.3 2021/09/21 20:34:37 christos Exp $
 
 NOOBJ= # defined
 
+.include <bsd.init.mk>
+
 .PATH: ${TOPDIR}/include/xray
 
 INCS+= xray_interface.h
 INCS+= xray_log_interface.h
 INCS+= xray_records.h
 
-.include <bsd.own.mk>
-
-INCSDIR=       /usr/lib/clang/9.0.0/include/xray
+INCSDIR=       /usr/lib/clang/${CLANG_VER}/include/xray
 
 .include <bsd.prog.mk>
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/lib/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc       Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc        Tue Sep 21 20:34:37 2021 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
--- a/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk   Tue Sep 21 15:56:55 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk   Tue Sep 21 20:34:37 2021 +0000
@@ -1,12 +1,7 @@
-# $NetBSD: common.mk,v 1.6 2021/09/17 02:18:01 christos Exp $
+# $NetBSD: common.mk,v 1.7 2021/09/21 20:34:38 christos Exp $
 
 NOSANITIZER=   # defined
 NODEBUG=       # defined
 NOLIBCSANITIZER=# defined
 
-.include <bsd.own.mk>
-
-TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-
-CLANG_VER!=    cd ${NETBSDSRCDIR}/external/apache2/llvm && \
-    ${MAKE} -V LLVM_VERSION
+.include <bsd.init.mk>
diff -r d3fa0d108d7e -r 3af5a1ba5c93 external/bsd/compiler_rt/lib/clang/share/Makefile
--- a/external/bsd/compiler_rt/lib/clang/share/Makefile Tue Sep 21 15:56:55 2021 +0000
+++ b/external/bsd/compiler_rt/lib/clang/share/Makefile Tue Sep 21 20:34:37 2021 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile,v 1.2 2020/02/07 19:00:10 kamil Exp $
-
-TOPDIR=        ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
+#      $NetBSD: Makefile,v 1.3 2021/09/21 20:34:38 christos Exp $
 
 NOOBJ= # defined
+.include <bsd.init.mk>
 
 .PATH: ${TOPDIR}/lib/asan
 INCS+= asan_blacklist.txt
@@ -10,8 +9,6 @@
 .PATH: ${TOPDIR}/lib/msan
 INCS+= msan_blacklist.txt
 
-.include <bsd.own.mk>
-
-INCSDIR=       /usr/lib/clang/9.0.0/share
+INCSDIR=       /usr/lib/clang/${CLANG_VER}/share
 
 .include <bsd.prog.mk>