From bd0a548ad4a155fec29473d4cc8e135832926973 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 2 Mar 2023 06:11:44 -0700
Subject: [PATCH] buildman: Correct CROSS_COMPILE output for sandbox
At present, 'buildman -A sandbox' adds the path containing the
toolchain at present. We can assume that this is in the path and
we don't want to set CROSS_COMPILE=/bin/ so change this to align
with what MakeEnvironment() does.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
tools/buildman/toolchain.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 688f2e2687..8f9130bdcd 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -156,9 +156,8 @@ class Toolchain:
Returns:
Value of that environment variable or arguments
"""
- wrapper = self.GetWrapper()
if which == VAR_CROSS_COMPILE:
- return wrapper + os.path.join(self.path, self.cross)
+ return self.GetWrapper() + self.cross
elif which == VAR_PATH:
return self.path
elif which == VAR_ARCH:
--
2.39.5