aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-01-11 20:21:05 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-01-11 20:21:05 +0000
commit9beb9a445d82c861967e8d7c72dd2f47399d6caa (patch)
tree1cca6ed9c54412d074c964df2b37afbe6e9c23f2
parent16f0c9919e54699c09913870b8aa80455947524f (diff)
downloadsrc-9beb9a445d82c861967e8d7c72dd2f47399d6caa.tar.gz
src-9beb9a445d82c861967e8d7c72dd2f47399d6caa.zip
MFC r311565:
Link llvm-ar to llvm-ranlib, if WITH_CLANG_EXTRAS is enabled. When invoked as llvm-ranlib, it can create an archive symbol table for archives of objects compiled for LTO by an LLVM compiler. Submitted by: Dan McGregor <danismostlikely@gmail.com> MFC r311806: After r311565, also remove llvm-ranlib from ObsoleteFiles.inc.
Notes
Notes: svn path=/stable/11/; revision=311934
-rw-r--r--ObsoleteFiles.inc1
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1
-rw-r--r--usr.bin/clang/llvm-ar/Makefile2
3 files changed, 3 insertions, 1 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index bb9f1dc421a9..d895c8977999 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2177,7 +2177,6 @@ OLD_LIBS+=usr/lib32/private/libyaml.so.1
OLD_FILES+=usr/lib32/private/libyaml_p.a
# 20140216: new clang import which bumps version from 3.3 to 3.4.
OLD_FILES+=usr/bin/llvm-prof
-OLD_FILES+=usr/bin/llvm-ranlib
OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
OLD_FILES+=usr/include/clang/3.3/altivec.h
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index feba5c12bdcd..a42e9474903e 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1493,6 +1493,7 @@ OLD_FILES+=usr/bin/llvm-mc
OLD_FILES+=usr/bin/llvm-nm
OLD_FILES+=usr/bin/llvm-objdump
OLD_FILES+=usr/bin/llvm-pdbdump
+OLD_FILES+=usr/bin/llvm-ranlib
OLD_FILES+=usr/bin/llvm-rtdyld
OLD_FILES+=usr/bin/llvm-symbolizer
OLD_FILES+=usr/bin/opt
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 546882127496..f6116ecefcc4 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -7,4 +7,6 @@ SRCS+= llvm-ar.cpp
LIBADD+= z
+LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib
+
.include "../llvm.prog.mk"