summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorTed Kremenek <kremenek@apple.com>2010-07-15 06:36:57 +0000
committerTed Kremenek <kremenek@apple.com>2010-07-15 06:36:57 +0000
commitd634bcbc89667be8793da2fefd1ab6655880e1c9 (patch)
treef7a6795b424451edc33f4516490b7532585ee241 /Makefile.rules
parentd2bfe54b0a9f28c021d4f0790bdb5224d5579447 (diff)
downloadllvm-d634bcbc89667be8793da2fefd1ab6655880e1c9.tar.gz
llvm-d634bcbc89667be8793da2fefd1ab6655880e1c9.tar.bz2
llvm-d634bcbc89667be8793da2fefd1ab6655880e1c9.tar.xz
Correctly set rpath on Mac OS X for executable tools. Note that I am not certain this is the best fix; the code immediately above looks confused, as it first checks to see if we are NOT on Darwin and then checks the Darwin version number. This fix allows c-index-test (in Clang) to run outside of running the regression test suite. I would appreciate if someone reviewed this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108416 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 9e77efb8cb..12582f6f91 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -632,7 +632,12 @@ ifdef TOOLNAME
endif
endif
endif
+else
+ifneq ($(DARWIN_MAJVERS),4)
+ LD.Flags += $(RPATH) -Wl,@executable_path/../lib
endif
+endif
+
#----------------------------------------------------------
# Options To Invoke Tools