From 37f5abfcb4a6553652235909db2e124b6f8ff3a5 Mon Sep 17 00:00:00 2001 From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:52:27 +0800 Subject: [PATCH] Fix Issues with libstdcxx and conda sysroot (#2482) --- install.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index c3d2085..ea8d2e2 100644 --- a/install.sh +++ b/install.sh @@ -170,7 +170,13 @@ if ! $USE_HF && ! $USE_HF_MIRROR && ! $USE_MODELSCOPE; then exit 1 fi -# 安装构建工具 +case "$(uname -m)" in + x86_64|amd64) SYSROOT_PKG="sysroot_linux-64>=2.28" ;; + aarch64|arm64) SYSROOT_PKG="sysroot_linux-aarch64>=2.28" ;; + ppc64le) SYSROOT_PKG="sysroot_linux-ppc64le>=2.28" ;; + *) echo "Unsupported architecture: $(uname -m)"; exit 1 ;; +esac + # Install build tools echo -e "${INFO}Detected system: $(uname -s) $(uname -r) $(uname -m)" if [ "$(uname)" != "Darwin" ]; then @@ -178,10 +184,14 @@ if [ "$(uname)" != "Darwin" ]; then if [ "$gcc_major_version" -lt 11 ]; then echo -e "${INFO}Installing GCC & G++..." run_conda_quiet gcc=11 gxx=11 + run_conda_quiet "$SYSROOT_PKG" echo -e "${SUCCESS}GCC & G++ Installed..." else echo -e "${INFO}Detected GCC Version: $gcc_major_version" echo -e "${INFO}Skip Installing GCC & G++ From Conda-Forge" + echo -e "${INFO}Installing libstdcxx-ng From Conda-Forge" + run_conda_quiet "libstdcxx-ng>=$gcc_major_version" + echo -e "${SUCCESS}libstdcxx-ng=$gcc_major_version Installed..." fi else if ! xcode-select -p &>/dev/null; then