maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 251953
This commit is contained in:
Tim Northover 2015-11-03 18:14:42 +00:00
parent e0550a80a4
commit 33e3ed17da
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
clang/runtime/compiler-rt/Makefile
View File

@ -83,25 +83,6 @@ RuntimeLibrary.darwin.Configs := \
IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null) IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)
IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 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),) ifneq ($(IOS_SDK)$(IOSSIM_SDK),)
RuntimeLibrary.darwin.Configs += ios.a profile_ios.a RuntimeLibrary.darwin.Configs += ios.a profile_ios.a
@ -118,23 +99,9 @@ RuntimeLibrary.darwin.Configs += asan_iossim_dynamic.dylib \
ubsan_iossim_dynamic.dylib ubsan_iossim_dynamic.dylib
endif endif
RuntimeLibrary.macho_embedded.Configs := \
ifneq ($(TVOS_SDK)$(TVOSSIM_SDK),) hard_static.a hard_pic.a
RuntimeLibrary.darwin.Configs += tvos.a profile_tvos.a ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
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 += \ RuntimeLibrary.macho_embedded.Configs += \
soft_static.a soft_pic.a soft_static.a soft_pic.a
endif endif