[llvm] r182559 - Remove redundant rpath.

Rafael Espindola rafael.espindola at gmail.com
Wed May 22 19:53:23 PDT 2013


Author: rafael
Date: Wed May 22 21:53:22 2013
New Revision: 182559

URL: http://llvm.org/viewvc/llvm-project?rev=182559&view=rev
Log:
Remove redundant rpath.

These are not needed since we added the $ORIGIN based rpath.

Fixes pr12517.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=182559&r1=182558&r2=182559&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Wed May 22 21:53:22 2013
@@ -639,12 +639,7 @@ endif
 ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
   ifneq ($(HOST_OS), Darwin)
     ifdef TOOLNAME
-      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
-      ifdef EXAMPLE_TOOL
-        LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag)
-      else
-        LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag)
-      endif
+      LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(DynamicFlag)
     endif
   else
     ifneq ($(DARWIN_MAJVERS),4)





More information about the llvm-commits mailing list