map additional variables

Author: UebelAndre

util/process_wrapper/BUILD.bazel

@@ -1,32 +1,7 @@
-load("@bazel_skylib//lib:selects.bzl", "selects")
-
 # buildifier: disable=bzl-visibility
 load("//rust/private:rust.bzl", "rust_binary_without_process_wrapper", "rust_test_without_process_wrapper_test")
 load("//util/process_wrapper/private:bootstrap_process_wrapper.bzl", "bootstrap_process_wrapper")
 
-config_setting(
-    name = "compilation_mode_opt",
-    values = {"compilation_mode": "opt"},
-)
-
-selects.config_setting_group(
-    name = "opt_linux",
-    match_all = [
-        ":compilation_mode_opt",
-        "@platforms//os:linux",
-    ],
-    visibility = ["@rules_rust_tinyjson//:__pkg__"],
-)
-
-selects.config_setting_group(
-    name = "opt_macos",
-    match_all = [
-        ":compilation_mode_opt",
-        "@platforms//os:macos",
-    ],
-    visibility = ["@rules_rust_tinyjson//:__pkg__"],
-)
-
 rust_binary_without_process_wrapper(
     name = "process_wrapper",
     srcs = glob(["*.rs"]),
@@ -37,10 +12,12 @@ rust_binary_without_process_wrapper(
     edition = "2018",
     # To ensure the process wrapper is produced deterministically
     # debug info, which is known to sometimes have host specific
-    # paths embedded in this section, is stripped out.
+    # paths embedded in this section, is stripped out. On macOS,
+    # full symbol stripping is needed to also remove N_OSO stab
+    # entries whose timestamps vary between builds.
     rustc_flags = select({
-        ":opt_linux": ["-Cstrip=debuginfo"],
-        ":opt_macos": ["-Cstrip=symbols"],
+        "@platforms//os:linux": ["-Cstrip=debuginfo"],
+        "@platforms//os:macos": ["-Cstrip=symbols"],
         "//conditions:default": [],
     }),
     visibility = ["//visibility:public"],

util/process_wrapper/BUILD.tinyjson.bazel

@@ -10,8 +10,8 @@ rust_library_without_process_wrapper(
     # debug info, which is known to sometimes have host specific
     # paths embedded in this section, is stripped out.
     rustc_flags = select({
-        "@rules_rust//util/process_wrapper:opt_linux": ["-Cstrip=debuginfo"],
-        "@rules_rust//util/process_wrapper:opt_macos": ["-Cstrip=debuginfo"],
+        "@platforms//os:linux": ["-Cstrip=debuginfo"],
+        "@platforms//os:macos": ["-Cstrip=debuginfo"],
         "//conditions:default": [],
     }),
     visibility = ["@rules_rust//util/process_wrapper:__pkg__"],

util/process_wrapper/private/process_wrapper.bat

@@ -6,6 +6,15 @@ SET command=%*
 :: Resolve the `${pwd}` placeholders
 SET command=!command:${pwd}=%CD%!
 
+:: Resolve the `${output_base}` and `${exec_root}` placeholders.
+:: The external directory is a junction/symlink to output_base\external.
+:: This mirrors the logic in options.rs used by the real process wrapper.
+FOR /F "delims=" %%i IN ('cd external\.. ^& cd') DO SET output_base=%%i
+FOR %%i IN ("%CD%") DO SET workspace_name=%%~nxi
+SET exec_root=!output_base!\execroot\!workspace_name!
+SET command=!command:${output_base}=%output_base%!
+SET command=!command:${exec_root}=%exec_root%!
+
 :: Strip out the leading `--` argument.
 SET command=!command:~3!
 

util/process_wrapper/private/process_wrapper.sh

@@ -5,15 +5,41 @@ set -eu
 # Skip the first argument which is expected to be `--`
 shift
 
+# Derive output_base and exec_root so we can expand their placeholders
+# in rustc flags (e.g. --remap-path-prefix, -oso_prefix). This mirrors
+# the logic in options.rs used by the real process wrapper.
+phys_pwd=$(cd -P . && pwd)
+if [ -d "external" ]; then
+    output_base=$(cd -P external/.. && pwd)
+else
+    output_base="${phys_pwd%/*}"
+    output_base="${output_base%/*}"
+fi
+workspace_name="${phys_pwd##*/}"
+exec_root="${output_base}/execroot/${workspace_name}"
+
 for arg in "$@"; do
     case "$arg" in
         *'${pwd}'*)
-            # Split on '${pwd}' and rejoin with the actual PWD value
             prefix="${arg%%\$\{pwd\}*}"
             suffix="${arg#*\$\{pwd\}}"
             arg="${prefix}${PWD}${suffix}"
             ;;
     esac
+    case "$arg" in
+        *'${output_base}'*)
+            prefix="${arg%%\$\{output_base\}*}"
+            suffix="${arg#*\$\{output_base\}}"
+            arg="${prefix}${output_base}${suffix}"
+            ;;
+    esac
+    case "$arg" in
+        *'${exec_root}'*)
+            prefix="${arg%%\$\{exec_root\}*}"
+            suffix="${arg#*\$\{exec_root\}}"
+            arg="${prefix}${exec_root}${suffix}"
+            ;;
+    esac
     set -- "$@" "$arg"
     shift
 done