commit e814a14105290af07a6614da5179590755091c38
author Simon Glass <sjg@chromium.org> Fri Mar 10 12:48:50 2023 -0800
committer Simon Glass <sjg@chromium.org> Tue Mar 14 16:08:52 2023 -0600
tree 830e6ec41c31db841319b28501cab0d70c1ec3de
parent ac55734bb79d55092cd4f2f52331e70636a42512

Revert "buildman: Correct CROSS_COMPILE output for sandbox"

This reverts commit bd0a548ad4a155fec29473d4cc8e135832926973.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/buildman/toolchain.py

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 8f9130b..688f2e2 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -156,8 +156,9 @@
         Returns:
             Value of that environment variable or arguments
         """
+        wrapper = self.GetWrapper()
         if which == VAR_CROSS_COMPILE:
-            return self.GetWrapper() + self.cross
+            return wrapper + os.path.join(self.path, self.cross)
         elif which == VAR_PATH:
             return self.path
         elif which == VAR_ARCH: