Skip to content

Commit

Permalink
Fix a missed ctx.fragments.cpp instance in rewriting swift_binary_tes…
Browse files Browse the repository at this point in the history
…t.bzl using new skylark cc toolchain api.

This is a part of the bazelbuild/bazel#4571 effort.

RELNOTES: None
PiperOrigin-RevId: 205096748
  • Loading branch information
Googler authored and allevato committed Jul 31, 2018
1 parent e036a2e commit 67b5e14
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions swift/internal/swift_binary_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,11 @@ def _swift_linking_rule_impl(ctx, is_test):
if toolchain.cc_toolchain_info:
cpp_toolchain = find_cpp_toolchain(ctx)
if (hasattr(cpp_toolchain, "link_options_do_not_use") and
hasattr(cc_common, "mostly_static_link_options")):
hasattr(cpp_toolchain, "mostly_static_link_options")):
# We only do this for non-Xcode toolchains at this time.
features = ctx.features
link_args.add_all(find_cpp_toolchain(ctx).link_options_do_not_use)
link_args.add_all(cc_common.mostly_static_link_options(
ctx.fragments.cpp,
toolchain.cc_toolchain_info,
features,
False,
))
link_args.add_all(cpp_toolchain.link_options_do_not_use)
link_args.add_all(cpp_toolchain.mostly_static_link_options(False))
elif hasattr(cc_common, "get_command_line"):
feature_configuration = cc_common.configure_features(
cc_toolchain = cpp_toolchain,
Expand Down

0 comments on commit 67b5e14

Please sign in to comment.