diff options
Diffstat (limited to 'tools/build_defs/apple/swift.bzl')
| -rw-r--r-- | tools/build_defs/apple/swift.bzl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl index 1a315a1930..fdae0fcf40 100644 --- a/tools/build_defs/apple/swift.bzl +++ b/tools/build_defs/apple/swift.bzl @@ -73,8 +73,15 @@ def _swift_library_impl(ctx): apple_fm = ctx.fragments.apple # TODO(dmishe): Use single_arch_cpu and single_arch_platform when available. - cpu = apple_fm.ios_cpu() - platform = apple_fm.ios_cpu_platform() + if (hasattr(apple_fm, "single_arch_cpu") + and hasattr(apple_fm, "single_arch_platform")): + cpu = apple_fm.single_arch_cpu + platform = apple_fm.single_arch_platform + else: + # TODO(dmishe): Remove this branch when single_arch_platform is available + # by default. + cpu = apple_fm.ios_cpu() + platform = apple_fm.ios_cpu_platform() sdk_version = apple_fm.sdk_version_for_platform(platform) target = _swift_target(cpu, platform, sdk_version) @@ -127,6 +134,7 @@ def _swift_library_impl(ctx): output_objs = [] for source in ctx.files.srcs: obj = ctx.new_file(source.basename + ".o") + print(obj) output_objs.append(obj) output_map += struct(**{source.path: struct(object=obj.path)}) |