From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 24/28] make.sh: Set correct PATH in stage1
Date: Fri, 04 Feb 2022 16:47:44 +0000
Message-ID: <20220204164748.315559-24-michael.tremer@ipfire.org>
In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4784881609121942531=="
List-Id: <development.lists.ipfire.org>

--===============4784881609121942531==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 make.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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


--===============4784881609121942531==--