Skip to content

Commit 06e6964

Browse files
lamcwJames Sharpe
andauthored
runnable_binary: use package_relative_label (#1253)
Co-authored-by: James Sharpe <[email protected]>
1 parent 2375e1d commit 06e6964

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

foreign_cc/utils.bzl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,19 @@ def runnable_binary(name, binary, foreign_cc_target, match_binary_name = False,
4747
sed s@SH_BINARY_FILENAME@{sh_binary_filename}@g tmp > $@
4848
"""
4949

50+
if hasattr(native, "package_relative_label"):
51+
fg_label = native.package_relative_label(name + "_fg")
52+
else:
53+
# pre Bazel 6.1.0
54+
fg_label = full_label(name + "_fg")
55+
5056
native.genrule(
5157
name = name + "_wrapper",
5258
srcs = ["@rules_foreign_cc//foreign_cc/private:runnable_binary_wrapper.sh", name + "_fg"],
5359
outs = [name + "_wrapper.sh"],
5460
cmd = select({
55-
"@platforms//os:windows": wrapper_cmd.format(name = full_label(name + "_fg"), sh_binary_filename = binary + ".exe" if match_binary_name else name),
56-
"//conditions:default": wrapper_cmd.format(name = full_label(name + "_fg"), sh_binary_filename = binary if match_binary_name else name),
61+
"@platforms//os:windows": wrapper_cmd.format(name = fg_label, sh_binary_filename = binary + ".exe" if match_binary_name else name),
62+
"//conditions:default": wrapper_cmd.format(name = fg_label, sh_binary_filename = binary if match_binary_name else name),
5763
}),
5864
tags = tags + ["manual"],
5965
)

0 commit comments

Comments
 (0)