From bb72c9b0497ca2413e78984f53f7e7494794ef40 Mon Sep 17 00:00:00 2001 From: Egor Tsyganchuk Date: Mon, 30 Mar 2026 18:30:16 +0300 Subject: [PATCH] Update SYSROOT_DIR assignment in build-libraries.sh and remove --disable-tls from build-toolchain.sh configuration - Changed SYSROOT_DIR to directly reference SYSROOT for clarity. - Removed --disable-tls option from GCC build configuration to streamline the build process. --- build-libraries.sh | 2 +- build-toolchain.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build-libraries.sh b/build-libraries.sh index a081579..e0fe60a 100755 --- a/build-libraries.sh +++ b/build-libraries.sh @@ -19,7 +19,7 @@ export CXXFLAGS="" # Подготавливаем пути к разделам LIB_DIR="${TOP}/src/libs" -SYSROOT_DIR="${INSTALL_DIR}${SYSROOT}" +SYSROOT_DIR="${SYSROOT}" SYSROOT_ETC_DIR="${SYSROOT_DIR}/etc" SYSROOT_USR_DIR="${SYSROOT_DIR}/usr" BUILD_SRC_DIR="${TOP}/build" diff --git a/build-toolchain.sh b/build-toolchain.sh index 1abdaa2..2abfc5b 100755 --- a/build-toolchain.sh +++ b/build-toolchain.sh @@ -125,8 +125,7 @@ mkdir -p "${BUILD_DIR}/gcc1" && cd "${BUILD_DIR}/gcc1" --without-cloog \ --without-ppl \ --disable-nls \ - --disable-libatomic \ - --disable-tls + --disable-libatomic make -j$(nproc) all-gcc make install-gcc @@ -197,8 +196,7 @@ mkdir -p "${BUILD_DIR}/gcc2" && cd "${BUILD_DIR}/gcc2" --disable-multilib \ --disable-bootstrap \ --disable-libgomp \ - --disable-libatomic \ - --disable-tls + --disable-libatomic make -j$(nproc) make install