[Lldb-commits] [lldb] r250751 - Revert r248047 and fix the problem properly

[Keno Fischer via lldb-commits]

Author: kfischer
Date: Mon Oct 19 17:59:16 2015
New Revision: 250751

URL: http://llvm.org/viewvc/llvm-project?rev=250751&view=rev
Log:
Revert r248047 and fix the problem properly

In r248047, I attempted to fix a build breakage introduced by using
llvm's regex support from lldb-mi. However, my approach was flawed
when LLVM and lldb are dynamically linked, in which case two copies
of LLVMSupport would end up in memory, causing crashes on lldb start up.
Instead, use LINK_COMPONENTS to make sure lldb-mi has access to the
LLVMSupport symbols without causing duplication in the dynamic library
case.

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

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=250751&r1=250750&r2=250751&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Mon Oct 19 17:59:16 2015
@@ -98,7 +98,6 @@ USEDLIBS = lldbAPI.a \
 	LLVMMCDisassembler.a \
 	LLVMProfileData.a \
 	LLVMObjCARCOpts.a \
-	LLVMSupport.a \
 	lldbPluginPlatformMacOSX.a \
 	lldbPluginPlatformLinux.a \
 	lldbPluginPlatformWindows.a \

Modified: lldb/trunk/tools/lldb-mi/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/Makefile?rev=250751&r1=250750&r2=250751&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/Makefile (original)
+++ lldb/trunk/tools/lldb-mi/Makefile Mon Oct 19 17:59:16 2015
@@ -13,6 +13,7 @@ TOOLNAME = lldb-mi
 NO_PEDANTIC = 1
 
 LLVMLibsOptions += -ledit -llldb -llldbUtility
+LINK_COMPONENTS := support
 
 include $(LLDB_LEVEL)/Makefile