diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2014-11-10 17:46:55 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2014-11-10 17:46:55 +0000 |
| commit | 2b5488adac8f65c3a3da4ff2c9776ab36c93efe9 (patch) | |
| tree | fb4e4cfd7a49f925a814f2cbb5a78d1b0fe44db2 /runtime | |
| parent | 2b03c6434c91542ebc969fa2e57fbd802177d890 (diff) | |
Only build iOS runtime libraries when the iOS SDKs are available.
This was already set up for the iOS simulator ASan dylib simulator,
and this change extends that to the other iOS runtime libraries.
This is in preparation for building all those iOS libraries against
the real SDKs instead of the fake SDKs in compiler-rt.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@221614 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 0211f50335..7e2e2a8597 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -80,11 +80,26 @@ RuntimeDirs := ifeq ($(OS),Darwin) RuntimeDirs += darwin macho_embedded RuntimeLibrary.darwin.Configs := \ - eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \ + eprintf.a 10.4.a osx.a cc_kext.a \ asan_osx_dynamic.dylib \ - profile_osx.a profile_ios.a \ + profile_osx.a \ ubsan_osx.a +IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null) +IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null) + +ifneq ($(IOS_SDK)$(IOSSIM_SDK),) +RuntimeLibrary.darwin.Configs += ios.a profile_ios.a +endif + +ifneq ($(IOS_SDK),) +RuntimeLibrary.darwin.Configs += cc_kext_ios5.a +endif + +ifneq ($(IOSSIM_SDK),) +RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib +endif + RuntimeLibrary.macho_embedded.Configs := \ hard_static.a hard_pic.a ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD))) @@ -101,10 +116,6 @@ ACTIVE_SDK_PATH := $(shell xcrun --show-sdk-path 2> /dev/null) ifneq ($(ACTIVE_SDK_PATH),) COMPILERRT_MAKE_FLAGS := SDKROOT=$(ACTIVE_SDK_PATH) endif -IOSSIM_SDK_PATH := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null) -ifneq ($(IOSSIM_SDK_PATH),) -RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib -endif endif |