? build_asan.sh
? build_llvm.sh
? clean_llvm.sh
Index: Makefile
===================================================================
RCS file: /cvsroot/src/Makefile,v
retrieving revision 1.328
diff -u -r1.328 Makefile
--- Makefile	23 Aug 2019 06:38:27 -0000	1.328
+++ Makefile	25 Aug 2019 00:58:19 -0000
@@ -136,7 +136,11 @@
 # _SUBDIR is used to set SUBDIR, after removing directories that have
 # BUILD_${dir}=no, or that have no ${dir}/Makefile.
 #
-_SUBDIR=	tools .WAIT lib include external crypto/external bin
+_SUBDIR=	tools .WAIT lib
+.if ${MKLLVM} != "no"
+_SUBDIR+=	.WAIT external/bsd/compiler_rt .WAIT
+.endif
+_SUBDIR+=	 include external crypto/external bin
 _SUBDIR+=	games libexec sbin usr.bin
 _SUBDIR+=	usr.sbin share sys etc tests compat
 _SUBDIR+=	.WAIT rescue .WAIT distrib regress
@@ -236,8 +240,7 @@
 BUILDTARGETS+=	do-lib
 BUILDTARGETS+=	do-compat-lib
 .if ${MKLLVM} != "no"
-BUILDTARGETS+=	do-sanitizer-includes
-BUILDTARGETS+=	do-sanitizer-lib
+#BUILDTARGETS+=	do-sanitizer
 .if ${MKSANITIZER:Uno} == "yes"
 BUILDTARGETS+=	do-sanitizer-tools
 .endif
@@ -477,15 +480,11 @@
 do-compat-lib: .PHONY .MAKE
 	${MAKEDIRTARGET} compat build_install BOOTSTRAP_SUBDIRS="../../../lib"
 
-do-sanitizer-includes: .PHONY .MAKE
-	${MAKEDIRTARGET} external/bsd/compiler_rt/lib/clang/include includes
-	${MAKEDIRTARGET} external/bsd/compiler_rt/lib/clang/share includes
-
-do-sanitizer-lib: .PHONY .MAKE
-	${MAKEDIRTARGET} external/bsd/compiler_rt/lib/clang/lib build_install
+#do-sanitizer: .PHONY .MAKE
+#	${MAKEDIRTARGET} external/bsd/compiler_rt build_install
 
 do-sanitizer-tools: .PHONY .MAKE
-.if !exists(${TOOLDIR}/lib/clang)
+.if !exists(${TOOLDIR}/lib/clang) && ${HAVE_LLVM:Uno} == "yes"
 	mkdir -p ${TOOLDIR}/lib/clang
 	cd ${DESTDIR}/usr/lib/clang && \
 		${TOOL_PAX} -rw . ${TOOLDIR}/lib/clang
Index: external/bsd/compiler_rt/Makefile
===================================================================
RCS file: /cvsroot/src/external/bsd/compiler_rt/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- external/bsd/compiler_rt/Makefile	8 Aug 2019 14:00:27 -0000	1.1
+++ external/bsd/compiler_rt/Makefile	25 Aug 2019 00:58:20 -0000
@@ -1,5 +1,8 @@
 #	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:27 kamil Exp $
 
+.include <bsd.own.mk>
+
 SUBDIR+=	lib
 
+.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>
Index: external/bsd/compiler_rt/lib/clang/Makefile
===================================================================
RCS file: /cvsroot/src/external/bsd/compiler_rt/lib/clang/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- external/bsd/compiler_rt/lib/clang/Makefile	8 Aug 2019 14:00:28 -0000	1.1
+++ external/bsd/compiler_rt/lib/clang/Makefile	25 Aug 2019 00:58:20 -0000
@@ -1,11 +1,6 @@
 #	$NetBSD: Makefile,v 1.1 2019/08/08 14:00:28 kamil Exp $
 
-.include <bsd.own.mk>
-
 SUBDIR+=	include share
-
-.if ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=	lib
-.endif
 
 .include <bsd.subdir.mk>
Index: external/bsd/compiler_rt/lib/clang/lib/Makefile
===================================================================
RCS file: /cvsroot/src/external/bsd/compiler_rt/lib/clang/lib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- external/bsd/compiler_rt/lib/clang/lib/Makefile	23 Aug 2019 06:38:27 -0000	1.2
+++ external/bsd/compiler_rt/lib/clang/lib/Makefile	25 Aug 2019 00:58:20 -0000
@@ -2,5 +2,4 @@
 
 SUBDIR+=	netbsd
 
-.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>