summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2013-05-23 02:53:22 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2013-05-23 02:53:22 +0000
commit1529f0c7188ad21c598ffb748caf0dfa54b6a469 (patch)
treecb6526c5db1a45e0a3042dcbf31c62287ce9dddd /Makefile.rules
parentb58484ecd64647b6d7ec9ad2886a3d519df22076 (diff)
Remove redundant rpath.
These are not needed since we added the $ORIGIN based rpath. Fixes pr12517. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182559 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules7
1 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules
index c4840c4e60b..9cc6a2d927c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -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)