diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64e6632..4ff62b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: id: check-cache uses: actions/cache@main with: - key: gcc-14.1.0 + key: gcc-14.1.0-1 lookup-only: true path: | /tmp/x86_64-linux-gnu.tar.xz @@ -45,7 +45,7 @@ jobs: if: ${{ steps.check-cache.outputs.cache-hit != 'true' }} uses: actions/cache@main with: - key: gcc-14.1.0 + key: gcc-14.1.0-1 path: | /tmp/x86_64-linux-gnu.tar.xz /tmp/x86_64-linux-gnu.tar.xz.sha256 @@ -82,7 +82,7 @@ jobs: - name: Restore from cache uses: actions/cache@main with: - key: gcc-14.1.0 + key: gcc-14.1.0-1 fail-on-cache-miss: true path: | /tmp/x86_64-linux-gnu.tar.xz diff --git a/build.sh b/build.sh index 786217f..fd1d904 100644 --- a/build.sh +++ b/build.sh @@ -33,15 +33,9 @@ function setup_gcc_source() { declare -r tgt - if [ "${tgt}" = 'powerpc64le-unknown-linux-musl' ]; then - gcc_version='13' - gcc_directory='/tmp/gcc-13.3.0' - gcc_url='https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz' - else - gcc_version='14' - gcc_directory='/tmp/gcc-14.1.0' - gcc_url='https://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz' - fi + gcc_version='14' + gcc_directory='/tmp/gcc-14.1.0' + gcc_url='https://ftp.gnu.org/gnu/gcc/gcc-14.1.0/gcc-14.1.0.tar.xz' gcc_tarball="/tmp/gcc-${gcc_version}.tar.xz" @@ -56,7 +50,7 @@ function setup_gcc_source() { [ -d "${gcc_directory}/build" ] || mkdir "${gcc_directory}/build" - sed --in-place 's/LDBL_MANT_DIG == 106/defined(__powerpc64__)/g' "${gcc_directory}/libgcc/dfp-bit.h" + sed --in-place 's/LDBL_MANT_DIG == 106/defined(__powerpc__) || defined(__powerpc64__)/g' "${gcc_directory}/libgcc/dfp-bit.h" } diff --git a/powerpc-unknown-linux-musl.sh b/powerpc-unknown-linux-musl.sh index c81d846..5230f2c 100644 --- a/powerpc-unknown-linux-musl.sh +++ b/powerpc-unknown-linux-musl.sh @@ -2,7 +2,7 @@ declare packages=() -declare extra_configure_flags='--disable-decimal-float gcc_cv_target_ldbl128=no' +declare extra_configure_flags='' declare triplet='powerpc-unknown-linux-musl'