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

Nick Lewycky nicholas at mxc.ca
Sun Aug 1 20:16:19 PDT 2010


Author: nicholas
Date: Sun Aug  1 22:16:19 2010
New Revision: 110016

URL: http://llvm.org/viewvc/llvm-project?rev=110016&view=rev
Log:
Fix this condition; it has an else clause attached for Darwin only. Patch
by Takumi Nakamura.

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=110016&r1=110015&r2=110016&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sun Aug  1 22:16:19 2010
@@ -618,7 +618,8 @@
 endif
 
 # Adjust linker flags for building an executable
-ifneq ($(HOST_OS), $(filter $(HOST_OS), Darwin Cygwin MingW))
+ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+ifneq ($(HOST_OS), Darwin)
 ifdef TOOLNAME
   LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
   ifdef EXAMPLE_TOOL
@@ -632,6 +633,7 @@
   LD.Flags += $(RPATH) -Wl, at executable_path/../lib
 endif
 endif
+endif
 
 
 #----------------------------------------------------------





More information about the llvm-commits mailing list