[llvm-commits] [llvm] r108416 - /llvm/trunk/Makefile.rules

[Ted Kremenek]

Author: kremenek
Date: Thu Jul 15 01:36:57 2010
New Revision: 108416

URL: http://llvm.org/viewvc/llvm-project?rev=108416&view=rev
Log:
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.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=108416&r1=108415&r2=108416&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Thu Jul 15 01:36:57 2010
@@ -632,7 +632,12 @@
   endif
 endif
 endif
+else
+ifneq ($(DARWIN_MAJVERS),4)
+  LD.Flags += $(RPATH) -Wl, at executable_path/../lib
 endif
+endif
+
 
 #----------------------------------------------------------
 # Options To Invoke Tools