Module Name: src
Committed By: christos
Date: Tue Sep 21 20:34:38 UTC 2021
Modified Files:
src/external/bsd/compiler_rt/lib/clang/include/sanitizer: Makefile
src/external/bsd/compiler_rt/lib/clang/include/xray: Makefile
src/external/bsd/compiler_rt/lib/clang/lib/netbsd: common.mk
src/external/bsd/compiler_rt/lib/clang/share: Makefile
Added Files:
src/external/bsd/compiler_rt: Makefile.inc
src/external/bsd/compiler_rt/lib: Makefile.inc
src/external/bsd/compiler_rt/lib/clang: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/include: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib: Makefile.inc
src/external/bsd/compiler_rt/lib/clang/lib/netbsd: Makefile.inc
Log Message:
centralize version handling
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/compiler_rt/lib/clang/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/compiler_rt/lib/clang/share/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.3 src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.4
--- src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile:1.3 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/include/sanitizer/Makefile Tue Sep 21 16:34:37 2021
@@ -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+= netbsd_syscall_hooks.h
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>
Index: src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.2 src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.3
--- src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile:1.2 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/include/xray/Makefile Tue Sep 21 16:34:37 2021
@@ -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>
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk
diff -u src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.6 src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.7
--- src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk:1.6 Thu Sep 16 22:18:01 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/common.mk Tue Sep 21 16:34:38 2021
@@ -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>
Index: src/external/bsd/compiler_rt/lib/clang/share/Makefile
diff -u src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.2 src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.3
--- src/external/bsd/compiler_rt/lib/clang/share/Makefile:1.2 Fri Feb 7 14:00:10 2020
+++ src/external/bsd/compiler_rt/lib/clang/share/Makefile Tue Sep 21 16:34:38 2021
@@ -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 @@ INCS+= asan_blacklist.txt
.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>
Added files:
Index: src/external/bsd/compiler_rt/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -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
Index: src/external/bsd/compiler_rt/lib/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/include/Makefile.inc Tue Sep 21 16:34:37 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:37 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/Makefile.inc Tue Sep 21 16:34:38 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
Index: src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc
diff -u /dev/null src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc:1.1
--- /dev/null Tue Sep 21 16:34:38 2021
+++ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile.inc Tue Sep 21 16:34:38 2021
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/21 20:34:38 christos Exp $
+.include "${.PARSEDIR}/../Makefile.inc"
