From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sun, 16 May 2010 03:05:14 +0000 (+0000)
Subject: Use $ORIGIN in the rpath of libraries.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a89efd537d0b518b089e0a1dd6cecd9b7693c649;p=oota-llvm.git

Use $ORIGIN in the rpath of libraries.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103896 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Makefile.rules b/Makefile.rules
index d77fe27b27c..2fc5eeb0c7c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -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