From dddaf835439e966acd7d0a202fddbfddf022c218 Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Tue, 4 Jun 2024 14:38:54 +0200 Subject: [PATCH] CI: remove BUILD_PARALLEL_GCC --- .github/workflows/ficus.yml | 1 - ficus-toolchain/build-all.sh | 4 ++-- ficus-toolchain/build-s2.sh | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ficus.yml b/.github/workflows/ficus.yml index 2567b76df..fffce2334 100644 --- a/.github/workflows/ficus.yml +++ b/.github/workflows/ficus.yml @@ -9,7 +9,6 @@ on: env: BUILD_TYPE: Debug BUILD_PARALLEL: 3 - BUILD_PARALLEL_GCC: 3 jobs: build-ficus-toolchain: diff --git a/ficus-toolchain/build-all.sh b/ficus-toolchain/build-all.sh index fef1d55e3..10a3a1276 100755 --- a/ficus-toolchain/build-all.sh +++ b/ficus-toolchain/build-all.sh @@ -22,9 +22,9 @@ if [ -z "${BUILD_PARALLEL}" ] then export BUILD_PARALLEL=$(nproc) fi -if [ -z "${BUILD_PARALLEL_GCC}" ] +if [ -z "${BUILD_PARALLEL}" ] then - export BUILD_PARALLEL_GCC=$BUILD_PARALLEL + export BUILD_PARALLEL=$BUILD_PARALLEL fi if [[ "$1" != "s2only" ]] diff --git a/ficus-toolchain/build-s2.sh b/ficus-toolchain/build-s2.sh index b5d780764..93af96d81 100755 --- a/ficus-toolchain/build-s2.sh +++ b/ficus-toolchain/build-s2.sh @@ -30,7 +30,7 @@ popd ../gcc-13.2.0/configure --target=$TARGET --prefix="$PREFIX" --with-sysroot="$PREFIX/../../sysroot" --disable-nls \ --enable-languages=c,c++ --with-newlib --disable-fixincludes --disable-libstdcxx-threads \ --enable-version-specific-runtime-libs -make -j$BUILD_PARALLEL_GCC all-gcc +make -j$BUILD_PARALLEL all-gcc make -j$BUILD_PARALLEL all-target-libgcc make -j$BUILD_PARALLEL all-target-libstdc++-v3 make install-gcc