Use $ORIGIN in the rpath of libraries.
authorRafael Espindola <rafael.espindola@gmail.com>
Sun, 16 May 2010 03:05:14 +0000 (03:05 +0000)
committerRafael Espindola <rafael.espindola@gmail.com>
Sun, 16 May 2010 03:05:14 +0000 (03:05 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103896 91177308-0d34-0410-b5e6-96231b3b80d8

Makefile.rules

index d77fe27b27cc3d8b8a4fbe2c2b344ace8c6c031b..2fc5eeb0c7c33ad94566abd655b3697300884e37 100644 (file)
@@ -589,10 +589,14 @@ ifeq ($(TARGET_OS),Darwin)
 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