summaryrefslogtreecommitdiffstats
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
commitd02e7e56931e5af12550f91c6c7e3c0866f9ea6f (patch)
tree9ed3b783edab8a1f2d02be02a390999e01803df7
parent1250a307f65e5bacdb5ecc800871dc42536470d1 (diff)
downloadbcm5719-llvm-d02e7e56931e5af12550f91c6c7e3c0866f9ea6f.tar.gz
bcm5719-llvm-d02e7e56931e5af12550f91c6c7e3c0866f9ea6f.zip
Remove redundant rpath.
These are not needed since we added the $ORIGIN based rpath. Fixes pr12517. llvm-svn: 182559
-rw-r--r--llvm/Makefile.rules7
1 files changed, 1 insertions, 6 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index c4840c4e60b..9cc6a2d927c 100644
--- a/llvm/Makefile.rules
+++ b/llvm/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)
OpenPOWER on IntegriCloud