[src/trunk]: src Rework the LLVM compiler_rt build rules

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

details:   https://anonhg.NetBSD.org/src/rev/4a1b692c4715
branches:  trunk
changeset: 964985:4a1b692c4715
user:      kamil <kamil%NetBSD.org@localhost>
date:      Sun Aug 25 06:06:48 2019 +0000

description:
Rework the LLVM compiler_rt build rules

Register external/bsd/compiler_rt as a _SUBDIR. This will allow to handle
properly includes specific for compiler_rt.

Centralize build_install target for external/bsd/compiler_rt.

With the above changes MKOBJDIR is now respected properly for me.

Do not install LLVM sanitizers into TOOLDIR for !HAVE_LLVM.

diffstat:

 Makefile                                        |  21 ++++++++++-----------
 external/bsd/compiler_rt/Makefile               |   5 ++++-
 external/bsd/compiler_rt/lib/clang/Makefile     |   7 +------
 external/bsd/compiler_rt/lib/clang/lib/Makefile |   3 +--
 4 files changed, 16 insertions(+), 20 deletions(-)

diffs (91 lines):

diff -r e121cb368692 -r 4a1b692c4715 Makefile
--- a/Makefile  Sat Aug 24 14:21:13 2019 +0000
+++ b/Makefile  Sun Aug 25 06:06:48 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.328 2019/08/23 06:38:27 kamil Exp $
+#      $NetBSD: Makefile,v 1.329 2019/08/25 06:06:48 kamil Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -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+=      external/bsd/compiler_rt
+.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
diff -r e121cb368692 -r 4a1b692c4715 external/bsd/compiler_rt/Makefile
--- a/external/bsd/compiler_rt/Makefile Sat Aug 24 14:21:13 2019 +0000
+++ b/external/bsd/compiler_rt/Makefile Sun Aug 25 06:06:48 2019 +0000
@@ -1,5 +1,8 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:27 kamil Exp $
+#      $NetBSD: Makefile,v 1.2 2019/08/25 06:06:48 kamil Exp $
+
+.include <bsd.own.mk>
 
 SUBDIR+=       lib
 
+.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>
diff -r e121cb368692 -r 4a1b692c4715 external/bsd/compiler_rt/lib/clang/Makefile
--- a/external/bsd/compiler_rt/lib/clang/Makefile       Sat Aug 24 14:21:13 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/Makefile       Sun Aug 25 06:06:48 2019 +0000
@@ -1,11 +1,6 @@
-#      $NetBSD: Makefile,v 1.1 2019/08/08 14:00:28 kamil Exp $
-
-.include <bsd.own.mk>
+#      $NetBSD: Makefile,v 1.2 2019/08/25 06:06:48 kamil Exp $
 
 SUBDIR+=       include share
-
-.if ${MACHINE_ARCH} == "x86_64"
 SUBDIR+=       lib
-.endif
 
 .include <bsd.subdir.mk>
diff -r e121cb368692 -r 4a1b692c4715 external/bsd/compiler_rt/lib/clang/lib/Makefile
--- a/external/bsd/compiler_rt/lib/clang/lib/Makefile   Sat Aug 24 14:21:13 2019 +0000
+++ b/external/bsd/compiler_rt/lib/clang/lib/Makefile   Sun Aug 25 06:06:48 2019 +0000
@@ -1,6 +1,5 @@
-#      $NetBSD: Makefile,v 1.2 2019/08/23 06:38:27 kamil Exp $
+#      $NetBSD: Makefile,v 1.3 2019/08/25 06:06:48 kamil Exp $
 
 SUBDIR+=       netbsd
 
-.include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>