merge upstream

This commit is contained in:
Sylvestre Ledru 2015-04-08 14:12:44 +00:00
parent 6ead522991
commit b39b9d4757
2 changed files with 0 additions and 14 deletions

View File

@ -1,13 +0,0 @@
Index: llvm-toolchain-snapshot_3.7~svn234307/lldb/tools/lldb-server/Makefile
===================================================================
--- llvm-toolchain-snapshot_3.7~svn234307.orig/lldb/tools/lldb-server/Makefile
+++ llvm-toolchain-snapshot_3.7~svn234307/lldb/tools/lldb-server/Makefile
@@ -12,6 +12,8 @@ TOOLNAME = lldb-server
LLVMLibsOptions += -llldb -llldbUtility
+USEDLIBS := LLVMSupport.a
+
include $(LLDB_LEVEL)/Makefile
ifeq ($(HOST_OS),Darwin)

View File

@ -38,4 +38,3 @@ strip-svn.diff
lit-lang.diff
compiler-rt-i586.diff
clang-analyzer-force-version.diff
lldb-undef.diff