[llvm-branch-commits] [llvm-branch] r121530 - /llvm/branches/Apple/whitney/Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 10 15:31:52 2010
New Revision: 121530

URL: http://llvm.org/viewvc/llvm-project?rev=121530&view=rev
Log:
Merge r121231:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Wed Dec 8 02:29:26 2010 +0000

    build: Shared libraries shouldn't used RPATH on Darwin, only main executables
    should use that.

Modified:
    llvm/branches/Apple/whitney/Makefile.rules

Modified: llvm/branches/Apple/whitney/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/Makefile.rules?rev=121530&r1=121529&r2=121530&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/Makefile.rules (original)
+++ llvm/branches/Apple/whitney/Makefile.rules Fri Dec 10 15:31:52 2010
@@ -517,10 +517,6 @@
 ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
 ifneq ($(HOST_OS),Darwin)
   LD.Flags += $(RPATH) -Wl,'$$ORIGIN'
-else
-ifneq ($(DARWIN_MAJVERS),4)
-  LD.Flags += $(RPATH) -Wl,$(SharedLibDir)
-endif
 endif
 endif
 endif