buildman: Fix CROSS_COMPILE output for sandbox

The previous attempt at fixing this broke the normal usage of the -A
flag.

At present, 'buildman -A sandbox' adds the path containing the
toolchain. We can assume that this is in the path and we don't want to
set CROSS_COMPILE=/bin/

Change this to align with what MakeEnvironment() does, but only for
sandbox boards.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-03-10 12:48:51 -08:00
parent 2dbfcf439a
commit c3cea95fd2

View file

@ -156,9 +156,10 @@ 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)
wrapper = self.GetWrapper()
base = '' if self.arch == 'sandbox' else self.path
return wrapper + os.path.join(base, self.cross)
elif which == VAR_PATH:
return self.path
elif which == VAR_ARCH: