summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2012-10-15 22:23:53 +0000
committerDaniel Dunbar <daniel@zuster.org>2012-10-15 22:23:53 +0000
commit7a0c064770355a4918df69f95de8dea6338a59a2 (patch)
tree432513d09dee9929231b3f91f2c2a41efa5bddeb /runtime
parent6cf7d7d0866b431388001b972762ef6e1ec1664b (diff)
Un-revert r164907 and r164902 (+ follow-ups), 10.6 build fix to follow.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165988 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
-rw-r--r--runtime/compiler-rt/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index fdf315a3c2..0336c01d03 100644
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -74,9 +74,9 @@ RuntimeDirs :=
ifeq ($(OS),Darwin)
RuntimeDirs += darwin
RuntimeLibrary.darwin.Configs := \
- eprintf.a 10.4.a osx.a cc_kext.a \
+ eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
asan_osx.a asan_osx_dynamic.dylib \
- profile_osx.a
+ profile_osx.a profile_ios.a
endif
# On Linux, include a library which has all the runtime functions.