aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/build_defs
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-10-18 00:09:54 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-10-18 10:57:20 +0000
commite3bf9869e8d6efaedeea8f63d2bbf766cfc387d3 (patch)
treeba340215c670c427c46e6a0fae9d7dd78cbb8306 /tools/build_defs
parent1c876de10e81e63d8f65cb001b6db4f5c66ea3f3 (diff)
Support tvOS and fix the platform min OS version selection.
-- MOS_MIGRATED_REVID=136416405
Diffstat (limited to 'tools/build_defs')
-rw-r--r--tools/build_defs/apple/swift.bzl4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl
index 6ddf95e365..48596f5665 100644
--- a/tools/build_defs/apple/swift.bzl
+++ b/tools/build_defs/apple/swift.bzl
@@ -36,7 +36,7 @@ def _intersperse(separator, iterable):
def _swift_target(cpu, platform, sdk_version):
"""Returns a target triplet for Swift compiler."""
platform_string = str(platform.platform_type)
- if platform_string not in ["ios", "watchos"]:
+ if platform_string not in ["ios", "watchos", "tvos"]:
fail("Platform '%s' is not supported" % platform_string)
return "%s-apple-%s%s" % (cpu, platform_string, sdk_version)
@@ -153,7 +153,7 @@ def _swift_library_impl(ctx):
platform = apple_fragment.single_arch_platform
target_os = ctx.fragments.apple.minimum_os_for_platform_type(
- apple_common.platform_type.ios)
+ platform.platform_type)
target = _swift_target(cpu, platform, target_os)
apple_toolchain = apple_common.apple_toolchain()