From 84a7e45f29647cef6e25907858d45efea108d8ca Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sat, 10 Jan 2026 03:07:45 +0100
Subject: [PATCH] u-boot: fix and unify `CROSS_COMPILE` and `PATH` after
 predatory maintenance

- also avoid spurious space in `CROSS_COMPILE` when `CCACHE` is not set
---
 lib/functions/compilation/uboot.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/functions/compilation/uboot.sh b/lib/functions/compilation/uboot.sh
index 6bc9ded9e3..a6be864605 100644
--- a/lib/functions/compilation/uboot.sh
+++ b/lib/functions/compilation/uboot.sh
@@ -51,6 +51,15 @@ function patch_uboot_target() {
 # also receives uboot_prefix, target_make, target_patchdir, target_files as input
 function compile_uboot_target() {
 	: "${artifact_version:?artifact_version is not set}"
+	: "${UBOOT_COMPILER:?UBOOT_COMPILER is not set}"
+
+	# prepare a CROSS_COMPILE stanza, quoted, with $CCACHE (if not empty) and $UBOOT_COMPILER
+	declare cross_compile="undetermined_cross_compile"
+	if [[ -n "${CCACHE}" ]]; then
+		cross_compile="CROSS_COMPILE='${CCACHE} ${UBOOT_COMPILER}'"
+	else
+		cross_compile="CROSS_COMPILE='${UBOOT_COMPILER}'"
+	fi
 
 	if [[ "${SHOW_DEBUG}" == "yes" ]]; then
 		display_alert "${uboot_prefix}Listing contents of u-boot directory" "'${version}' '${target_make}' before patching" "debug"
@@ -92,7 +101,7 @@ function compile_uboot_target() {
 	declare -g if_error_detail_message="${uboot_prefix}Failed to configure u-boot ${version} $BOOTCONFIG ${target_make}"
 	run_host_command_logged CCACHE_BASEDIR="$(pwd)" \
 		"KCFLAGS=-fdiagnostics-color=always" \
-		pipetty make "${CTHREADS}" "${BOOTCONFIG}" "CROSS_COMPILE=\"${CCACHE} ${UBOOT_COMPILER}\""
+		pipetty make "${CTHREADS}" "${BOOTCONFIG}" "${cross_compile}"
 
 	# for modern (? 2018-2019?) kernel and non spi targets @TODO: this does not belong here
 	if [[ ${BOOTBRANCH} =~ ^tag:v201[8-9](.*) && ${target} != "spi" && -f .config ]]; then
@@ -176,7 +185,7 @@ function compile_uboot_target() {
 
 		run_host_command_logged CCACHE_BASEDIR="$(pwd)" \
 			"KCFLAGS=-fdiagnostics-color=always" \
-			pipetty make "olddefconfig" "CROSS_COMPILE=\"$CCACHE $UBOOT_COMPILER\""
+			pipetty make "olddefconfig" "${cross_compile}"
 
 	fi
 
@@ -207,7 +216,7 @@ function compile_uboot_target() {
 	display_alert "${uboot_prefix}Updating u-boot config with olddefconfig" "${version} ${target_make}" "info"
 	run_host_command_logged CCACHE_BASEDIR="$(pwd)" \
 		"KCFLAGS=-fdiagnostics-color=always" \
-		pipetty make "${CTHREADS}" "olddefconfig" "CROSS_COMPILE=\"${CCACHE} ${UBOOT_COMPILER}\""
+		pipetty make "${CTHREADS}" "olddefconfig" "${cross_compile}"
 
 	if [[ "${UBOOT_CONFIGURE:-"no"}" == "yes" ]]; then
 		display_alert "Saving pre-config u-boot defconfig" "UBOOT_CONFIGURE=yes; experimental" "warn"
@@ -237,14 +246,13 @@ function compile_uboot_target() {
 
 	# Collect make environment variables, similar to 'kernel-make.sh'
 	uboot_make_envs=(
+		"PATH='${PATH}'" # preserve PATH as-is
 		"CFLAGS='${uboot_cflags}'"
 		"KCFLAGS='${uboot_cflags}'"
 		"CCACHE_BASEDIR=$(pwd)"
 		"PYTHONPATH=\"${PYTHON3_INFO[MODULES_PATH]}:${PYTHONPATH}\"" # Insert the pip modules downloaded by Armbian into PYTHONPATH (needed e.g. for pyelftools)
 	)
 
-	cross_compile="CROSS_COMPILE=\"$CCACHE $UBOOT_COMPILER\""
-
 	display_alert "${uboot_prefix}Compiling u-boot" "${version} ${target_make} with gcc '${gcc_version_main}'" "info"
 	declare -g if_error_detail_message="${uboot_prefix}Failed to build u-boot ${version} ${target_make}"
 	do_with_ccache_statistics run_host_command_logged_long_running \