summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2012-06-14 20:00:25 +0000
committerNico Weber <nicolasweber@gmx.de>2012-06-14 20:00:25 +0000
commita9f18d17d034e4001db2d673c7cc3bc52dadbcb6 (patch)
treeb2e9d5066b08f9ca3b351cbca48f5d0d4f1c0ded /make
parentfc375d1c9404154925389180d0f741d6711bfb7f (diff)
Don't build compiler-rt arm code on darwin. Fixes PR12918.
I'm not sure if this is the right fix, but this has been broken for two weeks and pleas for review were ignored. It seems to do the right thing. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@158466 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
-rw-r--r--make/platform/clang_darwin.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 96fc942e1..d3f7748d1 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -12,6 +12,7 @@ CheckArches = \
$(shell \
result=""; \
for arch in $(1); do \
+ if [ "$$arch" = "armv6" -o "$$arch" = "armv7" ]; then continue; fi; \
if $(CC) -arch $$arch -c \
-integrated-as \
$(ProjSrcRoot)/make/platform/clang_darwin_test_input.c \