From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Jan 2022 10:27:40 +0000 (+0000)
Subject: make.sh: Add CUSTOM_PATH option to lfsmake1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f52f77046062e18ed87c8bf6a7466968c0addb3d;p=people%2Fms%2Fipfire-2.x.git

make.sh: Add CUSTOM_PATH option to lfsmake1

This is required so that we use the host's tools to perform the
stripping.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index cd7464917a..f59624665e 100755
--- a/make.sh
+++ b/make.sh
@@ -663,8 +663,12 @@ lfsmake1() {
 	lfsmakecommoncheck $*
 	[ $? == 1 ] && return 0
 
+	if [ -n "${CUSTOM_PATH}" ]; then
+		local PATH="${CUSTOM_PATH}:${PATH}"
+	fi
+
 	cd $BASEDIR/lfs && env -i \
-		PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin:${PATH}" \
+		PATH="${PATH}" \
 		CCACHE_DIR="${CCACHE_DIR}"/${BUILD_ARCH}/${TOOLCHAINVER} \
 		CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -1062,7 +1066,7 @@ buildtoolchain() {
 	lfsmake1 bison
 	lfsmake1 flex
 	lfsmake1 fake-environ
-	lfsmake1 strip
+	CUSTOM_PATH="${PATH}" lfsmake1 strip
 	lfsmake1 cleanup-toolchain
 }