From cfb2b120a2e190d840b5d63a6cfb48d62807aa28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Wed, 26 Jul 2023 12:24:16 +0200
Subject: [PATCH] fix[bazel]: Use ld (and other tools) from binutils
Upstream bazel resorts to /usr/bin/TOOLNAME paths otherwise.
---
packages/bazel/package.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/packages/bazel/package.py b/packages/bazel/package.py
index a2cc4d96..29564c82 100644
--- a/packages/bazel/package.py
+++ b/packages/bazel/package.py
@@ -413,6 +413,9 @@ class Bazel(Package):
"required for most builds using bazel with spack",
)
+ # to provide ld via GCC_HOST_COMPILER_PREFIX
+ depends_on("binutils", type=("build"))
+
# https://bazel.build/install/compile-source#bootstrap-unix-prereq
depends_on("java", type=("build", "run"))
depends_on("java@11", when="@5.3:", type=("build", "run"))
@@ -508,6 +511,9 @@ class Bazel(Package):
return url.format(version)
+ def setup_dependent_build_environment(self, env, dependent_spec):
+ env.prepend_path("GCC_HOST_COMPILER_PREFIX", self.spec['binutils'].prefix.bin)
+
def setup_build_environment(self, env):
# fix the broken linking (on power9)
# https://github.com/bazelbuild/bazel/issues/10327
--
GitLab