]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
make.sh: Set correct PATH in stage1
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 4 Feb 2022 16:47:44 +0000 (16:47 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Sat, 5 Feb 2022 12:13:32 +0000 (12:13 +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 447fa4651057bcb785f947b073b8104e2c880f44..1afc8177eb4e0147844d2742a97ea5796996593f 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 \