summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2013-06-25 02:15:14 +0000
committerChandler Carruth <chandlerc@gmail.com>2013-06-25 02:15:14 +0000
commit6ca5bec3b518c41e60e9f2d89e458af67a38b2da (patch)
treeee875336a90344cd6fa16242c2ddeb5d225261ed /make
parent3515fb60c6edb50c3e4c0928100fefdf7bb495bc (diff)
downloadcompiler-rt-6ca5bec3b518c41e60e9f2d89e458af67a38b2da.tar.gz
compiler-rt-6ca5bec3b518c41e60e9f2d89e458af67a38b2da.tar.bz2
compiler-rt-6ca5bec3b518c41e60e9f2d89e458af67a38b2da.tar.xz
Temporarily disable building the armv7 variants of profile_ios on
darwin. After talking with Jim Grosbach pretty extensively, he was OK with me punting on this to the Apple folks. We agreed that the correct fix is either to extend the fake SDK headers in compiler-rt to support the rest of libc needed by GCDAProfiling.c or to teach the make build to test for the existence of a suitable SDK on the system prior to building it. Both of these require someone with access to the SDK which I don't have, and the latter (my preferred solution) requires understanding the strange compiler-rt make build system. Punting to Dan Dunbar or one of the others who support this stuff on ios to write the appropriate fix, and we can let the build bots proceed in the mean time. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@184816 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
-rw-r--r--make/platform/clang_darwin.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 8aa4bbf3..45f2258c 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -67,7 +67,12 @@ UniversalArchs.cc_kext_ios5 := $(call CheckArches,x86_64 armv7,cc_kext_ios5)
Configs += profile_osx
UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
Configs += profile_ios
-UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
+# FIXME: I've removed the armv7 configs for profile_ios until a viable solution
+# to using the *actual* SDK instead of a fake SDK sysroot is found (or until
+# the fake SDK sysroot is expanded correctly for darwin errno on all the
+# various platforms that I can't find out about).
+#UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
+UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64,profile_ios)
# Configurations which define the ASAN support functions.
Configs += asan_osx_dynamic