[gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/files/

["Michał Górny" <mgorny@gentoo.org>]

commit:     e4866ca37424bf0503850780543463b50f7f501c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 18:30:17 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 18:30:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e4866ca3

Fix broken rpaths for llvm-9999 as well.

It seems that I was mistaken and both versions need $ORIGIN.

---
 sys-devel/llvm/files/llvm-3.4-gentoo-install.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
index 2798fa7..a1a27c9 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -55,12 +55,12 @@ index 1bc78f1..60cd228 100644
    ifneq ($(HOST_OS), Darwin)
      ifdef TOOLNAME
 -      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
++      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' $(DynamicFlag)
      endif
    else
      ifneq ($(DARWIN_MAJVERS),4)
 -      LD.Flags += $(RPATH) -Wl,@executable_path/../lib
-+      LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)'
++      LD.Flags += $(RPATH) -Wl,@executable_path/../lib $(RPATH) -Wl,'$(PROJ_libdir)'
      endif
      ifeq ($(RC_XBS),YES)
        TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)