diff options
| author | Simon Glass <sjg@chromium.org> | 2023-03-10 12:48:51 -0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-03-14 16:08:52 -0600 |
| commit | c3cea95fd21937ce82be3dbd1062dde8fb0e6114 (patch) | |
| tree | 025c879f4ee98187a0ac8d7ff1ba56b7d6bad23a /tools | |
| parent | 2dbfcf439a3d4223feed5b3be03f1ddaff2384be (diff) | |
| download | u-boot-c3cea95fd21937ce82be3dbd1062dde8fb0e6114.tar.gz | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/toolchain.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 688f2e2687..241e8e6930 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -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: |