diff options
| author |  Julio Merino <jmmv@google.com> | 2016-09-01 13:44:31 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-09-01 14:50:00 +0000 |
| commit | 5748e2d444616a533de6261f07cb9c50da8743a9 (patch) | |
| tree | 6255c2bbf6ff331acedd2171d73ef6dc3ba48411 /tools | |
| parent | af4bf300208f3f5a587f27331ad2e47966a76f09 (diff) | |
Disable references to single_arch_{cpu,platform}.
These two Skylark symbols are functions, not variables. I attempted to
correct the references to match the symbol type, but I cannot get the
tests to fully pass -- so better disable this until properly fixed.
--
MOS_MIGRATED_REVID=131942175
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_defs/apple/shared.bzl | 8 | ||||
| -rw-r--r-- | tools/build_defs/apple/swift.bzl | 12 |
2 files changed, 5 insertions, 15 deletions
diff --git a/tools/build_defs/apple/shared.bzl b/tools/build_defs/apple/shared.bzl index 05d96ceb91..97c567f18a 100644 --- a/tools/build_defs/apple/shared.bzl +++ b/tools/build_defs/apple/shared.bzl @@ -65,12 +65,8 @@ def xcrun_action(ctx, **kw): This method takes the same keyword arguments as ctx.action, however you don't need to specify the executable. """ - if hasattr(ctx.fragments.apple, "single_arch_platform"): - platform = ctx.fragments.apple.single_arch_platform - else: - # TODO(dmishe): Remove this branch when single_arch_platform is available - # by default. - platform = ctx.fragments.apple.ios_cpu_platform() + # TODO(dmishe): Use single_arch_platform() when available. + platform = ctx.fragments.apple.ios_cpu_platform() action_env = ctx.fragments.apple.target_apple_env(platform) \ + ctx.fragments.apple.apple_host_system_env() diff --git a/tools/build_defs/apple/swift.bzl b/tools/build_defs/apple/swift.bzl index 4a6f443518..1a315a1930 100644 --- a/tools/build_defs/apple/swift.bzl +++ b/tools/build_defs/apple/swift.bzl @@ -72,15 +72,9 @@ def _swift_library_impl(ctx): # TODO(b/29772303): Assert xcode version. apple_fm = ctx.fragments.apple - if (hasattr(apple_fm, "single_arch_platform") - and hasattr(apple_fm, "single_arch_cpu")): - 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() + # TODO(dmishe): Use single_arch_cpu and single_arch_platform when available. + 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) |