aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanya Lattner <tonic@nondot.org>2009-09-12 22:25:41 +0000
committerTanya Lattner <tonic@nondot.org>2009-09-12 22:25:41 +0000
commita087e06d042c4b12caf6b051715f41f0167c0d70 (patch)
tree9b756340510df3f1e348cd1289478fd555aec90e
parent31f28dfaee4fca9368467f4fcb9d886d4ddf33ec (diff)
Merge 81240 from mainline.
Do not specify -mmacosx-version-min if building for arm-apple-darwin. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_26@81637 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 5556684d5b..aaaadeb356 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -513,7 +513,10 @@ ifeq ($(HOST_OS),Darwin)
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 @@ else
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