r251712 - Support watchOS and tvOS in compiler-rt builds

[Alexey Samsonov via cfe-commits]

Do we need to port this to CMake as well?

On Fri, Oct 30, 2015 at 9:30 AM, Tim Northover via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: tnorthover
> Date: Fri Oct 30 11:30:51 2015
> New Revision: 251712
>
> URL: http://llvm.org/viewvc/llvm-project?rev=251712&view=rev
> Log:
> Support watchOS and tvOS in compiler-rt builds
>
> Hopefully autotools will be deprecated soon and this entire file can go
> away,
> but until then...
>
> Modified:
>     cfe/trunk/runtime/compiler-rt/Makefile
>
> Modified: cfe/trunk/runtime/compiler-rt/Makefile
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=251712&r1=251711&r2=251712&view=diff
>
> ==============================================================================
> --- cfe/trunk/runtime/compiler-rt/Makefile (original)
> +++ cfe/trunk/runtime/compiler-rt/Makefile Fri Oct 30 11:30:51 2015
> @@ -83,6 +83,25 @@ 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
> @@ -99,9 +118,23 @@ RuntimeLibrary.darwin.Configs += asan_io
>                                   ubsan_iossim_dynamic.dylib
>  endif
>
> -RuntimeLibrary.macho_embedded.Configs := \
> -       hard_static.a hard_pic.a
> -ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
> +
> +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 += \
>         soft_static.a soft_pic.a
>  endif
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>



-- 
Alexey Samsonov
vonosmas at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20151030/3bdc3f62/attachment.html>