From 1c74bc461dc4bd14b16d492c5e25a0bb272b9eb9 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Feb 2022 16:47:44 +0000
Subject: [PATCH] make.sh: Set correct PATH in stage1

We did not use any of the tools that we were building which made the
build fail when cross-building on a different architecture.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 make.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/make.sh b/make.sh
index 447fa46510..1afc8177eb 100755
--- a/make.sh
+++ b/make.sh
@@ -663,8 +663,11 @@ lfsmake1() {
 	lfsmakecommoncheck $*
 	[ $? == 1 ] && return 0
 
+	# Set PATH to use the toolchain tools first and then whatever the host has set
+	local PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin:${PATH}"
+
 	if [ -n "${CUSTOM_PATH}" ]; then
-		local PATH="${CUSTOM_PATH}:${PATH}"
+		PATH="${CUSTOM_PATH}:${PATH}"
 	fi
 
 	cd $BASEDIR/lfs && env -i \
-- 
2.39.5