[Lldb-commits] [lldb] r127570 - /lldb/trunk/tools/driver/Makefile

[Stephen Wilson]

Author: wilsons
Date: Sun Mar 13 13:17:16 2011
New Revision: 127570

URL: http://llvm.org/viewvc/llvm-project?rev=127570&view=rev
Log:
Fix makefile builds when llvm is configured with -enable-shared.

We were dropping the expansion of -rpath=$(LibDir) on linux, which resulted in
the build not being able to resolve libLLVM.so.  Bring in the definition before
expanding the values hanging off LD.Flags.

Thanks to Jason E. Aten for reporting this!




Modified:
    lldb/trunk/tools/driver/Makefile

Modified: lldb/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Makefile?rev=127570&r1=127569&r2=127570&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Makefile (original)
+++ lldb/trunk/tools/driver/Makefile Sun Mar 13 13:17:16 2011
@@ -12,10 +12,7 @@
 
 LD.Flags += -ledit -llldb -llldbUtility
 
-# # Include this here so we can get the configuration of the targets that have
-# # been configured for construction. We have to do this early so we can set up
-# # LINK_COMPONENTS before including Makefile.rules
-include $(LLDB_LEVEL)/../../Makefile.config
+include $(LLDB_LEVEL)/Makefile
 
 ifeq ($(HOST_OS),Darwin)
 	LD.Flags += -Wl,-rpath, at loader_path/../lib/
@@ -26,4 +23,3 @@
 	LD.Flags += -Wl,-rpath,$(LibDir)
 endif
 
-include $(LLDB_LEVEL)/Makefile