]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
make.sh: Set correct PATH in stage1
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 2 Feb 2022 18:00:58 +0000 (18:00 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Feb 2022 13:33:53 +0000 (13:33 +0000)
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

diff --git a/make.sh b/make.sh
index f59624665eb97ed014c0f651090b4ba157e22d86..3c7bc1011e7c8673aa348ea795e0e79478a1cd84 100755 (executable)
--- 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 \