<div dir="ltr">Do we need to port this to CMake as well?</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 30, 2015 at 9:30 AM, Tim Northover via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: tnorthover<br>
Date: Fri Oct 30 11:30:51 2015<br>
New Revision: 251712<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=251712&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=251712&view=rev</a><br>
Log:<br>
Support watchOS and tvOS in compiler-rt builds<br>
<br>
Hopefully autotools will be deprecated soon and this entire file can go away,<br>
but until then...<br>
<br>
Modified:<br>
    cfe/trunk/runtime/compiler-rt/Makefile<br>
<br>
Modified: cfe/trunk/runtime/compiler-rt/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=251712&r1=251711&r2=251712&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=251712&r1=251711&r2=251712&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/runtime/compiler-rt/Makefile (original)<br>
+++ cfe/trunk/runtime/compiler-rt/Makefile Fri Oct 30 11:30:51 2015<br>
@@ -83,6 +83,25 @@ RuntimeLibrary.darwin.Configs := \<br>
<br>
 IOS_SDK := $(shell xcrun --show-sdk-path -sdk iphoneos 2> /dev/null)<br>
 IOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk iphonesimulator 2> /dev/null)<br>
+TVOS_SDK := $(shell xcrun --show-sdk-path -sdk appletvos 2> /dev/null)<br>
+TVOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk appletvsimulator 2> /dev/null)<br>
+WATCHOS_SDK := $(shell xcrun --show-sdk-path -sdk watchos 2> /dev/null)<br>
+WATCHOSSIM_SDK := $(shell xcrun --show-sdk-path -sdk watchsimulator 2> /dev/null)<br>
+<br>
+LinkerSupportedArches = \<br>
+  $(shell \<br>
+    result=""; \<br>
+    for arch in $1; do \<br>
+      if $(LD) -v 2>&1 | grep "configured to support" | tr ' ' '\n' | grep "^$$arch$$" >/dev/null 2>/dev/null; then \<br>
+        result="$$result$$arch "; \<br>
+      fi; \<br>
+    done; \<br>
+    echo $$result)<br>
+<br>
+<br>
+RuntimeLibrary.macho_embedded.Configs := \<br>
+       hard_static.a hard_pic.a<br>
+ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))<br>
<br>
 ifneq ($(IOS_SDK)$(IOSSIM_SDK),)<br>
 RuntimeLibrary.darwin.Configs += ios.a profile_ios.a<br>
@@ -99,9 +118,23 @@ RuntimeLibrary.darwin.Configs += asan_io<br>
                                  ubsan_iossim_dynamic.dylib<br>
 endif<br>
<br>
-RuntimeLibrary.macho_embedded.Configs := \<br>
-       hard_static.a hard_pic.a<br>
-ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))<br>
+<br>
+ifneq ($(TVOS_SDK)$(TVOSSIM_SDK),)<br>
+RuntimeLibrary.darwin.Configs += tvos.a profile_tvos.a<br>
+endif<br>
+<br>
+ifneq ($(TVOS_SDK),)<br>
+RuntimeLibrary.darwin.Configs += cc_kext_tvos.a<br>
+endif<br>
+<br>
+ifneq ($(WATCHOS_SDK)$(WATCHOSSIM_SDK),)<br>
+RuntimeLibrary.darwin.Configs += watchos.a profile_watchos.a<br>
+endif<br>
+<br>
+ifneq ($(WATCHOS_SDK),)<br>
+RuntimeLibrary.darwin.Configs += cc_kext_watchos.a<br>
+endif<br>
+<br>
 RuntimeLibrary.macho_embedded.Configs += \<br>
        soft_static.a soft_pic.a<br>
 endif<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>