DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 22:36:48 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
* 修复Archlinux下的bootstrap脚本问题，

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


---------

Co-authored-by: longjin <longjin@dragonos.org>
This commit is contained in:
栗子 2024-03-09 21:20:12 +08:00 committed by GitHub
parent 3055390c25
commit 4f8f484930
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env.mk
View File

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

10
tools/build_gcc_toolchain.sh
View File

@ -180,10 +180,10 @@ if [ ! -n "$(find $PREFIX/bin/* -name $TARGET_GCC)" ] || [ ${KEEP_GCC} -ne 1 ];
mkdir build-gcc mkdir build-gcc
cd build-gcc cd build-gcc
../${GCC_FILE}/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers ../${GCC_FILE}/configure --target=$TARGET --prefix="$PREFIX" --disable-nls --enable-languages=c,c++ --without-headers
make all-gcc -j $(nproc) || exit 1 make MAKEINFO=true all-gcc -j $(nproc) || exit 1
make all-target-libgcc -j $(nproc) || exit 1 make MAKEINFO=true all-target-libgcc -j $(nproc) || exit 1
make install-gcc -j $(nproc) || exit 1 make MAKEINFO=true install-gcc -j $(nproc) || exit 1
make install-target-libgcc -j $(nproc) || exit 1 make MAKEINFO=true install-target-libgcc -j $(nproc) || exit 1
cd .. cd ..
fi fi
@ -196,7 +196,7 @@ else
echo 'export PATH="$DragonOS_GCC:$PATH"' >> "$HOME/.$(basename $SHELL)rc" echo 'export PATH="$DragonOS_GCC:$PATH"' >> "$HOME/.$(basename $SHELL)rc"
echo "[info] Add DragonOS_GCC into PATH successfully." echo "[info] Add DragonOS_GCC into PATH successfully."
fi fi
source "$HOME/.$(basename $SHELL)rc" source "$HOME/.$CURRENT_SHELL"rc
# final check # final check
if [ -n "$(find $PREFIX/bin/* -name $TARGET_GCC)" ] && if [ -n "$(find $PREFIX/bin/* -name $TARGET_GCC)" ] &&