From 2b5488adac8f65c3a3da4ff2c9776ab36c93efe9 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Mon, 10 Nov 2014 17:46:55 +0000 Subject: [PATCH] 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 --- runtime/compiler-rt/Makefile | 23 +++++++++++++++++------ 1 file 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 -- 2.50.1