Skip to content
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.

Sign up for GitHub

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

runnable_binary: use package_relative_label #1253

Merged
merged 4 commits into from
Aug 12, 2024
Merged

runnable_binary: use package_relative_label #1253

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f039ba9
runnable_binary: use package_relative_label
lamcw Aug 8, 2024
8f87aa5
Merge branch 'main' into runnable-binary-use-package-relative-label
jsharpe Aug 8, 2024
5b3732f
Guard package_relative_label
lamcw Aug 9, 2024
3804c71
Merge branch 'main' into runnable-binary-use-package-relative-label
jsharpe Aug 12, 2024
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
10 changes: 8 additions & 2 deletions foreign_cc/utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,19 @@ def runnable_binary(name, binary, foreign_cc_target, match_binary_name = False,
sed s@SH_BINARY_FILENAME@{sh_binary_filename}@g tmp > $@
"""

if hasattr(native, "package_relative_label"):
fg_label = native.package_relative_label(name + "_fg")
else:
# pre Bazel 6.1.0
fg_label = full_label(name + "_fg")

native.genrule(
name = name + "_wrapper",
srcs = ["@rules_foreign_cc//foreign_cc/private:runnable_binary_wrapper.sh", name + "_fg"],
outs = [name + "_wrapper.sh"],
cmd = select({
"@platforms//os:windows": wrapper_cmd.format(name = full_label(name + "_fg"), sh_binary_filename = binary + ".exe" if match_binary_name else name),
"//conditions:default": wrapper_cmd.format(name = full_label(name + "_fg"), sh_binary_filename = binary if match_binary_name else name),
"@platforms//os:windows": wrapper_cmd.format(name = fg_label, sh_binary_filename = binary + ".exe" if match_binary_name else name),
"//conditions:default": wrapper_cmd.format(name = fg_label, sh_binary_filename = binary if match_binary_name else name),
}),
tags = tags + ["manual"],
)
Expand Down