From 1d8e362a22be9ead657205185df2d1544283b81d Mon Sep 17 00:00:00 2001 From: Mike Lundy Date: Wed, 4 Sep 2024 11:31:03 -0700 Subject: [PATCH] runnable_binary: avoid using > on the output file (#1270) Co-authored-by: James Sharpe --- foreign_cc/utils.bzl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/foreign_cc/utils.bzl b/foreign_cc/utils.bzl index 0696a8bf..8e7e4772 100644 --- a/foreign_cc/utils.bzl +++ b/foreign_cc/utils.bzl @@ -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 > $@ + cp tmp $@ """ if hasattr(native, "package_relative_label"): @@ -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"], )