summaryrefslogtreecommitdiffstats
path: root/usr.bin/clang
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-02-14 14:13:00 +0000
committerdim <dim@FreeBSD.org>2015-02-14 14:13:00 +0000
commit9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe (patch)
treea7bc5b362ad6182396e88b223352f75d52966813 /usr.bin/clang
parentff34755926ad8a77e4498e82a23c847d33c6c72d (diff)
downloadFreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.zip
FreeBSD-src-9377b5ad0feb5dd018ed6cfc6378ac19c1252dfe.tar.gz
Merge llvm 3.6.0rc3 from ^/vendor/llvm/dist, merge clang 3.6.0rc3 from
^/vendor/clang/dist, resolve conflicts, and update patches README.
Diffstat (limited to 'usr.bin/clang')
-rw-r--r--usr.bin/clang/lldb/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index 7757145..5102835 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -93,7 +93,6 @@ LIBDEPS=\
llvmlinker \
llvmmcjit \
llvmruntimedyld \
- llvmjit \
llvmexecutionengine \
llvmirreader \
llvmipo \
OpenPOWER on IntegriCloud