From 5d4d628f39107d56fd8c843c0670df89b9157a5c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 8 Jan 2025 10:47:35 +0000 Subject: [PATCH] github: Remove sed hack from GCC build script --- .github/workflows/ci.yml | 3 +-- .github/workflows/release.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be0dd3b..28ae43e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: uses: actions/cache@v3 with: path: ~/cross - key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-3 + key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-4 - name: Build toolchain if: steps.cache-toolchain.outputs.cache-hit != 'true' @@ -53,7 +53,6 @@ jobs: make ${MAKE_OPTS} make install cd ../gcc-${GCC_RELEASE} - sed -i 's/--check/-c/g' contrib/download_prerequisites ./contrib/download_prerequisites mkdir ../gcc-build && cd ../gcc-build ../gcc-${GCC_RELEASE}/configure --prefix=$MDIR --target=m68k-elf --enable-languages=c --disable-libssp diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df20b64..d3c334e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: uses: actions/cache@v3 with: path: ~/cross - key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-3 + key: ${{ runner.os }}-${{ env.BINUTILS_RELEASE }}-${{ env.GCC_RELEASE }}-4 - name: Build toolchain if: steps.cache-toolchain.outputs.cache-hit != 'true' @@ -56,7 +56,6 @@ jobs: make ${MAKE_OPTS} make install cd ../gcc-${GCC_RELEASE} - sed -i 's/--check/-c/g' contrib/download_prerequisites ./contrib/download_prerequisites mkdir ../gcc-build && cd ../gcc-build ../gcc-${GCC_RELEASE}/configure --prefix=$MDIR --target=m68k-elf --enable-languages=c --disable-libssp