commit e13fcae3fce8b2c4db86339c9e8bafdd403f22b5
author Tom Rini <trini@konsulko.com> Fri Jul 05 14:34:07 2024 -0600
committer Tom Rini <trini@konsulko.com> Mon Jul 08 09:12:34 2024 -0600
tree 0127712ade83d72e880e94251515eacc47886608
parent 036e33cffb4a2c9aa68c56c4a92e74a7201ca9b7

Revert "buildman: Always use the full path in CROSS_COMPILE"

There are operations in buildman that result in running the cross-tools
(such as performing size checks) and now that we have not modified PATH
to know where our tools are, these operations fail.

This reverts commit 6c0a3cf75f72370deec3ee516a9dd377397af207.

Signed-off-by: Tom Rini <trini@konsulko.com>

tools/buildman/builderthread.py

diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py
index 4e085d6..bbe2f6f 100644
--- a/tools/buildman/builderthread.py
+++ b/tools/buildman/builderthread.py
@@ -406,7 +406,7 @@
                     the next incremental build
         """
         # Set up the environment and command line
-        env = self.toolchain.MakeEnvironment()
+        env = self.toolchain.MakeEnvironment(self.builder.full_path)
         mkdir(out_dir)
 
         args, cwd, src_dir = self._build_args(brd, out_dir, out_rel_dir,
@@ -574,7 +574,7 @@
                 outf.write(f'{result.return_code}')
 
             # Write out the image and function size information and an objdump
-            env = result.toolchain.MakeEnvironment()
+            env = result.toolchain.MakeEnvironment(self.builder.full_path)
             with open(os.path.join(build_dir, 'out-env'), 'wb') as outf:
                 for var in sorted(env.keys()):
                     outf.write(b'%s="%s"' % (var, env[var]))