[llvm-commits] [llvm] r103896 - /llvm/trunk/Makefile.rules

[Rafael Espindola]

Author: rafael
Date: Sat May 15 22:05:14 2010
New Revision: 103896

URL: http://llvm.org/viewvc/llvm-project?rev=103896&view=rev
Log:
Use $ORIGIN in the rpath of libraries.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=103896&r1=103895&r2=103896&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sat May 15 22:05:14 2010
@@ -589,10 +589,14 @@
 endif
 
 ifdef SHARED_LIBRARY
+ifneq ($(HOST_OS),Darwin)
+  LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
+else
 ifneq ($(DARWIN_MAJVERS),4)
   LD.Flags += $(RPATH) -Wl,$(LibDir)
 endif
 endif
+endif
 
 ifdef TOOL_VERBOSE
   C.Flags += -v