Skip to content

Adding target name to output path for plugin executable #1294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions swift/swift_compiler_plugin.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ load(
"@build_bazel_apple_support//lib:transitions.bzl",
"macos_universal_transition",
)
load("//swift/internal:feature_names.bzl", "SWIFT_FEATURE__SUPPORTS_MACROS")
load(
"@build_bazel_rules_swift//swift/internal:feature_names.bzl",
"SWIFT_FEATURE_ADD_TARGET_NAME_TO_OUTPUT",
"SWIFT_FEATURE__SUPPORTS_MACROS",
)
load("//swift/internal:features.bzl", "is_feature_enabled")
load(
"//swift/internal:linking.bzl",
Expand Down Expand Up @@ -111,6 +115,15 @@ def _swift_compiler_plugin_impl(ctx):
compilation_outputs = compile_result.compilation_outputs
supplemental_outputs = compile_result.supplemental_outputs

if is_feature_enabled(
feature_configuration = feature_configuration,
feature_name = SWIFT_FEATURE_ADD_TARGET_NAME_TO_OUTPUT,
):
# Making executable in a folder to avoid naming collisions
name = "{}/{}".format(ctx.label.name, ctx.label.name)
else:
name = ctx.label.name

binary_linking_outputs = register_link_binary_action(
actions = ctx.actions,
additional_inputs = ctx.files.swiftc_inputs,
Expand All @@ -119,7 +132,7 @@ def _swift_compiler_plugin_impl(ctx):
deps = deps,
feature_configuration = feature_configuration,
module_contexts = module_contexts,
name = ctx.label.name,
name = name,
output_type = "executable",
owner = ctx.label,
stamp = ctx.attr.stamp,
Expand Down