[llvm-branch-commits] [llvm-branch] r81637 - /llvm/branches/release_26/Makefile.rules

[Tanya Lattner]

Author: tbrethou
Date: Sat Sep 12 17:25:41 2009
New Revision: 81637

URL: http://llvm.org/viewvc/llvm-project?rev=81637&view=rev
Log:
Merge 81240 from mainline.
Do not specify -mmacosx-version-min if building for arm-apple-darwin.

Modified:
    llvm/branches/release_26/Makefile.rules

Modified: llvm/branches/release_26/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_26/Makefile.rules?rev=81637&r1=81636&r2=81637&view=diff

==============================================================================
--- llvm/branches/release_26/Makefile.rules (original)
+++ llvm/branches/release_26/Makefile.rules Sat Sep 12 17:25:41 2009
@@ -513,7 +513,10 @@
   DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
 
   SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress \
-                    -dynamiclib -mmacosx-version-min=$(DARWIN_VERSION)
+                    -dynamiclib
+  ifneq ($(ARCH),ARM)
+    SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)
+  endif
 else
   ifeq ($(HOST_OS),Cygwin)
     SharedLinkOptions=-shared -nostdlib -Wl,--export-all-symbols \
@@ -524,7 +527,9 @@
 endif
 
 ifeq ($(TARGET_OS),Darwin)
-  TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
+  ifneq ($(ARCH),ARM)
+    TargetCommonOpts += -mmacosx-version-min=$(DARWIN_VERSION)
+  endif
 endif
 
 # Adjust LD.Flags depending on the kind of library that is to be built. Note