summaryrefslogtreecommitdiffstats
path: root/clang/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
commit25bc0debf3f677b444d689e75c91f61678f95cdf (patch)
tree39d517ab2edc2b25badd8b0e794d28fd2c076078 /clang/runtime
parenteb71c99684136322d074fd4d59f93ce7db91a4dc (diff)
downloadbcm5719-llvm-25bc0debf3f677b444d689e75c91f61678f95cdf.tar.gz
bcm5719-llvm-25bc0debf3f677b444d689e75c91f61678f95cdf.zip
[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 llvm-svn: 248442
Diffstat (limited to 'clang/runtime')
-rw-r--r--clang/runtime/compiler-rt/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile
index 997643857d9..0ddcdd8aaca 100644
--- a/clang/runtime/compiler-rt/Makefile
+++ b/clang/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),)
OpenPOWER on IntegriCloud