From 7eccfe13f10cda25d0d3ae18134dade100ab1d9d Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Tue, 28 May 2024 15:55:23 +0200 Subject: stage-0/make: directly call the interpreter ... instead of relying on the #!-line that hard-codes /bin/sh. --- src/bootstrap/stage-0-make.TARGETS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/stage-0-make.TARGETS b/src/bootstrap/stage-0-make.TARGETS index 3dcefb3..51a5ec8 100644 --- a/src/bootstrap/stage-0-make.TARGETS +++ b/src/bootstrap/stage-0-make.TARGETS @@ -18,10 +18,12 @@ , "export LD=${CC}" , "export AR=true" , "export RANLIB=true" + , "export SHELL=${LOCALBASE}/bin/sh" + , "export CONFIG_SHELL=${LOCALBASE}/bin/sh" , "unset LDFLAGS" , "cd ${TMPDIR}" - , "${WORKDIR}/configure --prefix=/ --disable-nls --disable-rpath --disable-load --disable-dependency-tracking >configure.log 2>&1 || (cat configure.log && exit 1)" - , "./build.sh >build.log 2>&1 || true" + , "(sh ${WORKDIR}/configure --prefix=/ --disable-nls --disable-rpath --disable-load --disable-dependency-tracking >configure.log 2>&1) || (cat configure.log && exit 1)" + , "(sh ./build.sh >build.log 2>&1) || true" , "${CC} -o make $(ls src/*.o lib/*.o | LC_ALL=C sort) >build.log 2>&1 || (cat configure.log build.log && exit 1)" , "mv make ${DESTDIR}/bin/" ] @@ -46,7 +48,7 @@ , "export MAKE=${LOCALBASE}/make/bin/make" , "export CC=${LOCALBASE}/gcc/bin/gcc" , "export CXX=unused" - , "./configure --prefix=/ --disable-rpath --disable-load >configure.log 2>&1 || (cat configure.log && exit 1)" + , "sh ./configure --prefix=/ --disable-rpath --disable-load >configure.log 2>&1 || (cat configure.log && exit 1)" , "${MAKE} -j${NJOBS} MAKEINFO=missing >build.log 2>&1 || (cat configure.log build.log && exit 1)" , "${MAKE} -j${NJOBS} MAKEINFO=missing DESTDIR=${DESTDIR} install-strip >>build.log 2>&1 || (cat configure.log build.log && exit 1)" ] -- cgit v1.2.3