Skip to content

Commit 67b5e14

Browse files
Googlerallevato
authored andcommitted
Fix a missed ctx.fragments.cpp instance in rewriting swift_binary_test.bzl using new skylark cc toolchain api.
This is a part of the bazelbuild/bazel#4571 effort. RELNOTES: None PiperOrigin-RevId: 205096748
1 parent e036a2e commit 67b5e14

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

swift/internal/swift_binary_test.bzl

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,11 @@ def _swift_linking_rule_impl(ctx, is_test):
107107
if toolchain.cc_toolchain_info:
108108
cpp_toolchain = find_cpp_toolchain(ctx)
109109
if (hasattr(cpp_toolchain, "link_options_do_not_use") and
110-
hasattr(cc_common, "mostly_static_link_options")):
110+
hasattr(cpp_toolchain, "mostly_static_link_options")):
111111
# We only do this for non-Xcode toolchains at this time.
112112
features = ctx.features
113-
link_args.add_all(find_cpp_toolchain(ctx).link_options_do_not_use)
114-
link_args.add_all(cc_common.mostly_static_link_options(
115-
ctx.fragments.cpp,
116-
toolchain.cc_toolchain_info,
117-
features,
118-
False,
119-
))
113+
link_args.add_all(cpp_toolchain.link_options_do_not_use)
114+
link_args.add_all(cpp_toolchain.mostly_static_link_options(False))
120115
elif hasattr(cc_common, "get_command_line"):
121116
feature_configuration = cc_common.configure_features(
122117
cc_toolchain = cpp_toolchain,

0 commit comments

Comments
 (0)