[Lldb-commits] [lldb] r240104 - Don't link ObjCARCOpts twice. Fixes PR22543

[Keno Fischer]

Author: kfischer
Date: Thu Jun 18 18:45:51 2015
New Revision: 240104

URL: http://llvm.org/viewvc/llvm-project?rev=240104&view=rev
Log:
Don't link ObjCARCOpts twice. Fixes PR22543

ObjCARCOpts is already included by ClangCodeGen. Linking it again causes the error in PR22543.

Differential Revision: http://reviews.llvm.org/D10399

Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/tools/lldb-server/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=240104&r1=240103&r2=240104&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Thu Jun 18 18:45:51 2015
@@ -86,7 +86,6 @@ USEDLIBS = lldbAPI.a \
 	clangSema.a \
 	clangSerialization.a \
 	LLVMMCDisassembler.a \
-	LLVMObjCARCOpts.a \
 	LLVMProfileData.a \
 	lldbPluginPlatformMacOSX.a \
 	lldbPluginPlatformLinux.a \

Modified: lldb/trunk/tools/lldb-server/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-server/Makefile?rev=240104&r1=240103&r2=240104&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-server/Makefile (original)
+++ lldb/trunk/tools/lldb-server/Makefile Thu Jun 18 18:45:51 2015
@@ -12,7 +12,7 @@ TOOLNAME = lldb-server
 
 LLVMLibsOptions += -llldb -llldbUtility
 
-USEDLIBS := LLVMSupport.a
+LINK_COMPONENTS := support
 
 include $(LLDB_LEVEL)/Makefile