From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 2 Feb 2022 18:00:58 +0000 (+0000)
Subject: make.sh: Set correct PATH in stage1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08805eb5301cdd4262ddb3c65bc31ba4f5672e3c;p=people%2Fms%2Fipfire-2.x.git

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>
---

diff --git a/make.sh b/make.sh
index f59624665e..3c7bc1011e 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 \