From 1ff65860e431d74fff481848f9fbef656a31c11f Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Wed, 3 Oct 2012 21:03:42 +0000 Subject: [PATCH] Back out my temporary workaround for Apple buildbots. --- Reverse-merging r164909 into '.': U make/platform/clang_darwin.mk llvm-svn: 165159 --- compiler-rt/make/platform/clang_darwin.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk index f1e1d31..246ccf3 100644 --- a/compiler-rt/make/platform/clang_darwin.mk +++ b/compiler-rt/make/platform/clang_darwin.mk @@ -76,10 +76,10 @@ UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx) Configs += asan_osx_dynamic UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic) -#UniversalArchs.ios += $(call CheckArches,armv7f armv7k armv7s,ios) -#UniversalArchs.cc_kext += $(call CheckArches,armv7f armv7k armv7s,cc_kext) -#UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7f armv7k armv7s,cc_kext_ios5) -#UniversalArchs.profile_ios += $(call CheckArches,armv7f armv7k armv7s,profile_ios) +UniversalArchs.ios += $(call CheckArches,armv7f armv7k armv7s,ios) +UniversalArchs.cc_kext += $(call CheckArches,armv7f armv7k armv7s,cc_kext) +UniversalArchs.cc_kext_ios5 += $(call CheckArches,armv7f armv7k armv7s,cc_kext_ios5) +UniversalArchs.profile_ios += $(call CheckArches,armv7f armv7k armv7s,profile_ios) # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we # are intended to support and limit what we try to build to that. -- 2.7.4