Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -85,7 +85,6 @@
        clangSema.a \
        clangSerialization.a \
        LLVMMCDisassembler.a \
-       LLVMObjCARCOpts.a \
        LLVMProfileData.a \
        lldbPluginPlatformMacOSX.a \
        lldbPluginPlatformLinux.a \
Index: tools/lldb-server/Makefile
===================================================================
--- tools/lldb-server/Makefile
+++ tools/lldb-server/Makefile
@@ -12,7 +12,7 @@

 LLVMLibsOptions += -llldb -llldbUtility

-USEDLIBS := LLVMSupport.a
+LINK_COMPONENTS := support

 include $(LLDB_LEVEL)/Makefile