diff options
| author | Tim Northover <tnorthover@apple.com> | 2015-11-03 18:14:42 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2015-11-03 18:14:42 +0000 |
| commit | 603885ad10e8987f92249edf02037c230bbedd18 (patch) | |
| tree | 79dc5fff0f864d7e29661b0b5fda632cfc1e64db /runtime/compiler-rt | |
| parent | 136d238674bb22f07fb5558675fab9dff26cf57f (diff) | |
| download | clang-603885ad10e8987f92249edf02037c230bbedd18.tar.gz | |
Revert "Support watchOS and tvOS in compiler-rt builds"
The required compiler-rt changes aren't present yet so attempting to
build with compiler-rt breaks. And since we're trying to deprecate
autotools we actually want to fix this in CMake primarily anyway.
This reverts r251712.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@251953 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime/compiler-rt')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index 029fe1e293..55642a6f0c 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -83,25 +83,6 @@ RuntimeLibrary.darwin.Configs := \ IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null) IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null) -TVOS_SDK := $(shell xcrun --show-sdk-path -sdk appletvos 2> /dev/null) -TVOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk appletvsimulator 2> /dev/null) -WATCHOS_SDK := $(shell xcrun --show-sdk-path -sdk watchos 2> /dev/null) -WATCHOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk watchsimulator 2> /dev/null) - -LinkerSupportedArches = \ - $(shell \ - result=""; \ - for arch in $1; do \ - if $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \ - result="$$result$$arch "; \ - fi; \ - done; \ - echo $$result) - - -RuntimeLibrary.macho_embedded.Configs := \ - hard_static.a hard_pic.a -ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD))) ifneq ($(IOS_SDK)$(IOSSIM_SDK),) RuntimeLibrary.darwin.Configs += ios.a profile_ios.a @@ -118,23 +99,9 @@ RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \ ubsan_iossim_dynamic.dylib endif - -ifneq ($(TVOS_SDK)$(TVOSSIM_SDK),) -RuntimeLibrary.darwin.Configs += tvos.a profile_tvos.a -endif - -ifneq ($(TVOS_SDK),) -RuntimeLibrary.darwin.Configs += cc_kext_tvos.a -endif - -ifneq ($(WATCHOS_SDK)$(WATCHOSSIM_SDK),) -RuntimeLibrary.darwin.Configs += watchos.a profile_watchos.a -endif - -ifneq ($(WATCHOS_SDK),) -RuntimeLibrary.darwin.Configs += cc_kext_watchos.a -endif - +RuntimeLibrary.macho_embedded.Configs := \ + hard_static.a hard_pic.a +ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD))) RuntimeLibrary.macho_embedded.Configs += \ soft_static.a soft_pic.a endif |