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: avoid using > on the output file #1270

Merged
merged 2 commits into from
Sep 4, 2024
Merged

runnable_binary: avoid using > on the output file #1270

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a494da
runnable_binary: avoid using > on the output file
novas0x2a Aug 22, 2024
f99aad3
Merge branch 'main' into runnable-copy
jsharpe Sep 4, 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
7 changes: 2 additions & 5 deletions foreign_cc/utils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def runnable_binary(name, binary, foreign_cc_target, match_binary_name = False,

wrapper_cmd = """
sed s@EXECUTABLE@$(rlocationpath {name})@g $(location @rules_foreign_cc//foreign_cc/private:runnable_binary_wrapper.sh) > tmp
sed s@SH_BINARY_FILENAME@{sh_binary_filename}@g tmp > $@
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note[nonblocking]: I was wondering about this, so I checked on the history. SH_BINARY_FILENAME was added in 41c937a and the last (and only) use was removed in 4831827, so it seems like a pretty safe clean up.

cp tmp $@
"""

if hasattr(native, "package_relative_label"):
Expand All @@ -57,10 +57,7 @@ def runnable_binary(name, binary, foreign_cc_target, match_binary_name = False,
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 = 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),
}),
cmd = wrapper_cmd.format(name = fg_label),
tags = tags + ["manual"],
)

Expand Down