From 4f8f484930ed3c09ecf4b5b05b1dea14f7b05d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A0=97=E5=AD=90?= Date: Sat, 9 Mar 2024 21:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DArchlinux=E4=B8=8B=E7=9A=84bo?= =?UTF-8?q?otstrap=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98=EF=BC=8C=20(#552)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修复Archlinux下的bootstrap脚本问题， 由于archlinux 的 texinfo版本太新导致的gcc docs构建失败 使用 MAKEINFO=true 的make环境变量跳过gcc docs构建，绕过问题 --------- Co-authored-by: longjin --- env.mk | 2 +- tools/build_gcc_toolchain.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/env.mk b/env.mk index 6315d868..9d68ec88 100644 --- a/env.mk +++ b/env.mk @@ -50,4 +50,4 @@ endif ifeq ($(DEBUG), DEBUG) GLOBAL_CFLAGS += -g -endif \ No newline at end of file +endif diff --git a/tools/build_gcc_toolchain.sh b/tools/build_gcc_toolchain.sh index 829639e0..870917d1 100644 --- a/tools/build_gcc_toolchain.sh +++ b/tools/build_gcc_toolchain.sh @@ -180,10 +180,10 @@ if [ ! -n "$(find $PREFIX/bin/* -name $TARGET_GCC)" ] || [ ${KEEP_GCC} -ne 1 ]; mkdir build-gcc cd build-gcc ../${GCC_FILE}/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers - make all-gcc -j $(nproc) || exit 1 - make all-target-libgcc -j $(nproc) || exit 1 - make install-gcc -j $(nproc) || exit 1 - make install-target-libgcc -j $(nproc) || exit 1 + make MAKEINFO=true all-gcc -j $(nproc) || exit 1 + make MAKEINFO=true all-target-libgcc -j $(nproc) || exit 1 + make MAKEINFO=true install-gcc -j $(nproc) || exit 1 + make MAKEINFO=true install-target-libgcc -j $(nproc) || exit 1 cd .. fi @@ -196,7 +196,7 @@ else echo 'export PATH="$DragonOS_GCC:$PATH"' >> "$HOME/.$(basename $SHELL)rc" echo "[info] Add DragonOS_GCC into PATH successfully." fi -source "$HOME/.$(basename $SHELL)rc" +source "$HOME/.$CURRENT_SHELL"rc # final check if [ -n "$(find $PREFIX/bin/* -name $TARGET_GCC)" ] &&