From d634bcbc89667be8793da2fefd1ab6655880e1c9 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 15 Jul 2010 06:36:57 +0000 Subject: [PATCH] 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 --- Makefile.rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.rules b/Makefile.rules index 9e77efb8cb0..12582f6f91d 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