Update cross-toolchain configs

prysmaticlabs · Mar 13, 2023 · 503ccc9 · 503ccc9
1 parent ce823be
commit 503ccc9
Show file tree

Hide file tree

Showing 4 changed files with 165 additions and 70 deletions.
diff --git a/tools/cross-toolchain/README.md b/tools/cross-toolchain/README.md
@@ -36,7 +36,7 @@ rbe_configs_gen \
   --generate_cpp_configs=true \
   --generate_java_configs=true \
   --cpp_env_json=tools/cross-toolchain/cpp_env_clang.json \
-  --toolchain_container=gcr.io/prysmaticlabs/rbe-worker@sha256:9a30c5ff7dcd1fbc5cb5b5f320782dec755a31cd2f6811e238a8584d94b04e78 # The sha256 digest from step 2.
+  --toolchain_container=gcr.io/prysmaticlabs/rbe-worker@sha256:90d490709a0fb0c817569f37408823a0490e5502cbecc36415caabfc36a0c2e8 # The sha256 digest from step 2.
 ```
 
 4) Test the builds work locally for all supported platforms.

diff --git a/tools/cross-toolchain/configs/cc/BUILD b/tools/cross-toolchain/configs/cc/BUILD
@@ -132,6 +132,7 @@ cc_toolchain_config(
         "ar": "/usr/bin/ar",
         "ld": "/usr/bin/ld",
         "llvm-cov": "/usr/bin/llvm-cov",
+        "llvm-profdata": "/usr/bin/llvm-profdata",
         "cpp": "/usr/bin/cpp",
         "gcc": "/usr/bin/clang-12",
         "dwp": "/usr/bin/dwp",

diff --git a/tools/cross-toolchain/configs/cc/armeabi_cc_toolchain_config.bzl b/tools/cross-toolchain/configs/cc/armeabi_cc_toolchain_config.bzl
@@ -43,12 +43,12 @@ def _impl(ctx):
 
     tool_paths = [
         tool_path(name = "ar", path = "/bin/false"),
-        tool_path(name = "compat-ld", path = "/bin/false"),
         tool_path(name = "cpp", path = "/bin/false"),
         tool_path(name = "dwp", path = "/bin/false"),
         tool_path(name = "gcc", path = "/bin/false"),
         tool_path(name = "gcov", path = "/bin/false"),
         tool_path(name = "ld", path = "/bin/false"),
+        tool_path(name = "llvm-profdata", path = "/bin/false"),
         tool_path(name = "nm", path = "/bin/false"),
         tool_path(name = "objcopy", path = "/bin/false"),
         tool_path(name = "objdump", path = "/bin/false"),