[src/trunk]: src/external/bsd/llvm Fix linking for the optional llvm-ar tool.

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

details:   https://anonhg.NetBSD.org/src/rev/b3111eccfb5a
branches:  trunk
changeset: 825841:b3111eccfb5a
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Aug 01 21:40:03 2017 +0000

description:
Fix linking for the optional llvm-ar tool.

diffstat:

 external/bsd/llvm/bin/llvm-ar/Makefile                   |   5 ++-
 external/bsd/llvm/lib/Makefile                           |   3 +-
 external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile |  21 ++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r 016eafc85048 -r b3111eccfb5a external/bsd/llvm/bin/llvm-ar/Makefile
--- a/external/bsd/llvm/bin/llvm-ar/Makefile    Tue Aug 01 20:09:43 2017 +0000
+++ b/external/bsd/llvm/bin/llvm-ar/Makefile    Tue Aug 01 21:40:03 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2017/08/01 20:07:38 joerg Exp $
+#      $NetBSD: Makefile,v 1.10 2017/08/01 21:40:03 joerg Exp $
 
 PROG_CXX=      llvm-ar
 NOMAN=         yes
@@ -10,6 +10,8 @@
 SRCS=  llvm-ar.cpp
 
 LLVM_LIBS+= \
+       ToolDriversDlltool \
+       ToolDrivers \
        AArch64AsmParser \
        AArch64MCTargetDesc \
        AArch64AsmPrinter \
@@ -45,7 +47,6 @@
        BitReader \
        IR \
        BinaryFormat \
-       ToolDrivers \
        Option \
        Support \
        Demangle
diff -r 016eafc85048 -r b3111eccfb5a external/bsd/llvm/lib/Makefile
--- a/external/bsd/llvm/lib/Makefile    Tue Aug 01 20:09:43 2017 +0000
+++ b/external/bsd/llvm/lib/Makefile    Tue Aug 01 21:40:03 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2017/08/01 20:07:40 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2017/08/01 21:40:03 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -115,6 +115,7 @@
        libLLVMLineEditor \
        libLLVMObjectYAML \
        libLLVMToolDrivers \
+       libLLVMToolDriversDlltool \
        libLLVMXRay
 .endif
 
diff -r 016eafc85048 -r b3111eccfb5a external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile  Tue Aug 01 21:40:03 2017 +0000
@@ -0,0 +1,21 @@
+#      $NetBSD: Makefile,v 1.1 2017/08/01 21:40:03 joerg Exp $
+
+LIB=   LLVMToolDriversDlltool
+
+.include <bsd.init.mk>
+
+.PATH: ${LLVM_SRCDIR}/lib/ToolDrivers/llvm-dlltool
+
+SRCS+= DlltoolDriver.cpp
+
+TABLEGEN_SRC=          Options.td
+TABLEGEN_OUTPUT= \
+       Options.inc|-gen-opt-parser-defs
+
+.include "${.PARSEDIR}/../../tablegen.mk"
+
+.if defined(HOSTLIB)
+.include <bsd.hostlib.mk>
+.else
+.include <bsd.lib.mk>
+.endif