Module Name: src
Committed By: joerg
Date: Tue Aug 1 21:40:03 UTC 2017
Modified Files:
src/external/bsd/llvm/bin/llvm-ar: Makefile
src/external/bsd/llvm/lib: Makefile
Added Files:
src/external/bsd/llvm/lib/libLLVMToolDriversDlltool: Makefile
Log Message:
Fix linking for the optional llvm-ar tool.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/bin/llvm-ar/Makefile
cvs rdiff -u -r1.45 -r1.46 src/external/bsd/llvm/lib/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/llvm/lib/libLLVMToolDriversDlltool/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/llvm/bin/llvm-ar/Makefile
diff -u src/external/bsd/llvm/bin/llvm-ar/Makefile:1.9 src/external/bsd/llvm/bin/llvm-ar/Makefile:1.10
--- src/external/bsd/llvm/bin/llvm-ar/Makefile:1.9 Tue Aug 1 20:07:38 2017
+++ src/external/bsd/llvm/bin/llvm-ar/Makefile Tue Aug 1 21:40:03 2017
@@ -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 @@ NOMAN= yes
SRCS= llvm-ar.cpp
LLVM_LIBS+= \
+ ToolDriversDlltool \
+ ToolDrivers \
AArch64AsmParser \
AArch64MCTargetDesc \
AArch64AsmPrinter \
@@ -45,7 +47,6 @@ LLVM_LIBS+= \
BitReader \
IR \
BinaryFormat \
- ToolDrivers \
Option \
Support \
Demangle
Index: src/external/bsd/llvm/lib/Makefile
diff -u src/external/bsd/llvm/lib/Makefile:1.45 src/external/bsd/llvm/lib/Makefile:1.46
--- src/external/bsd/llvm/lib/Makefile:1.45 Tue Aug 1 20:07:40 2017
+++ src/external/bsd/llvm/lib/Makefile Tue Aug 1 21:40:03 2017
@@ -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 @@ SUBDIR+= \
libLLVMLineEditor \
libLLVMObjectYAML \
libLLVMToolDrivers \
+ libLLVMToolDriversDlltool \
libLLVMXRay
.endif
Added files:
Index: src/external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile
diff -u /dev/null src/external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile:1.1
--- /dev/null Tue Aug 1 21:40:03 2017
+++ src/external/bsd/llvm/lib/libLLVMToolDriversDlltool/Makefile Tue Aug 1 21:40:03 2017
@@ -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
