From 7f6e47d27c673e29250cbdac03e326b9ba044b05 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 29 Nov 2024 00:36:40 +0000 Subject: trees: reset PATH per-target Otherwise, if PATH was set before, it will be re-used again in the next pass. We previously unset CROSS_COMPILE to avoid using the wrong cross-compiler when switching to another target within a multi-tree project such as U-Boot. Well, PATH was also being set, to use coreboot xgcc first. This is fine, but the next target may not use the same one. This patch solves a similar problem to the following patch which was mentioned above: commit 637c0a1521a03e3f65de85dcc5ffd478b37a5360 Author: Leah Rowe Date: Tue Nov 19 02:52:28 2024 +0000 trees: unset CROSS_COMPILE per target Signed-off-by: Leah Rowe --- script/trees | 3 +++ 1 file changed, 3 insertions(+) (limited to 'script/trees') diff --git a/script/trees b/script/trees index 8f468d49..698d2b34 100755 --- a/script/trees +++ b/script/trees @@ -9,6 +9,8 @@ set -u -e . "include/lib.sh" . "include/git.sh" +XBMKPATH="$PATH" + eval `setvars "" xarch srcdir premake cmakedir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ @@ -74,6 +76,7 @@ build_targets() for x in $targets; do unset CROSS_COMPILE + export PATH="$XBMKPATH" [ "$x" = "list" ] && x_ ls -1 "config/$project" && \ listfile="" && break target="$x" -- cgit v1.2.1