summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2015-09-23 22:52:35 +0000
committerChris Bieneman <beanz@apple.com>2015-09-23 22:52:35 +0000
commit261b6512ccd334c6fc80d0d254a98627b053b07d (patch)
tree598c7f7bf104471539c1529a7d81cc7792221755 /runtime
parentbb98aee681b328c134d60f31a4f68417877352f6 (diff)
[darwin] [builtins] Stop generating cc_kext_ios5 and move iOS architectures out of cc_kext into cc_kext_ios
Summary: This corresponds to a patch to compiler-rt (D13112). Xcode 7 doesn't support targeting iOS5 and earlier. Instead of just dropping cc_kext_ios5, I've repurposed it to cc_kext_ios, and I'm pulling the iOS architectures out of cc_kext. Putting OS X and iOS slices inside the same archive was just odd. Reviewers: bogner, bob.wilson Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D13113 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@248442 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r--runtime/compiler-rt/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index 997643857d..0ddcdd8aac 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -89,7 +89,7 @@ RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
endif
ifneq ($(IOS_SDK),)
-RuntimeLibrary.darwin.Configs += cc_kext_ios5.a
+RuntimeLibrary.darwin.Configs += cc_kext_ios.a
endif
ifneq ($(IOSSIM_SDK),)