Procházet zdrojové kódy

修复Archlinux下的bootstrap脚本问题, (#552)

* 修复Archlinux下的bootstrap脚本问题,

由于archlinux 的 texinfo版本太新导致的gcc docs构建失败
使用 MAKEINFO=true 的make环境变量跳过gcc docs构建,绕过问题


---------

Co-authored-by: longjin <[email protected]>
栗子 před 1 rokem
rodič
revize
4f8f484930
2 změnil soubory, kde provedl 6 přidání a 6 odebrání
  1. 1 1
      env.mk
  2. 5 5
      tools/build_gcc_toolchain.sh

+ 1 - 1
env.mk

@@ -50,4 +50,4 @@ endif
 
 ifeq ($(DEBUG), DEBUG)
 GLOBAL_CFLAGS += -g 
-endif
+endif

+ 5 - 5
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)" ] &&