From: Simon Glass <sjg@chromium.org>
Date: Fri, 10 Mar 2023 20:48:50 +0000 (-0800)
Subject: Revert "buildman: Correct CROSS_COMPILE output for sandbox"
X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-favicon.png?a=commitdiff_plain;h=2dbfcf439a3d4223feed5b3be03f1ddaff2384be;p=u-boot.git

Revert "buildman: Correct CROSS_COMPILE output for sandbox"

This reverts commit bd0a548ad4a155fec29473d4cc8e135832926973.

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

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 8f9130bdcd..688f2e2687 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -156,8 +156,9 @@ class Toolchain:
         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: