diff options
| author | Tommy Murphy <tommy_murphy@hotmail.com> | 2023-06-28 11:32:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-28 11:32:19 +0100 |
| commit | 4ad0a28801bc89f39f5104bcc56628003c1444e3 (patch) | |
| tree | 2215fc57f63654b01dc3de5d14f2a2433bffc402 | |
| parent | 1d9f992a1598e1edf646b7100d8a34d34332d17e (diff) | |
| parent | 6da3855437e8ab7a8272400287186d5242610172 (diff) | |
| download | riscv-gnu-toolchain-4ad0a28801bc89f39f5104bcc56628003c1444e3.zip riscv-gnu-toolchain-4ad0a28801bc89f39f5104bcc56628003c1444e3.tar.gz riscv-gnu-toolchain-4ad0a28801bc89f39f5104bcc56628003c1444e3.tar.bz2 | |
Merge branch 'riscv-collab:master' into master
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/nightly-release.yaml | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 00e00ba..f1feea2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,8 +20,6 @@ jobs: exclude: - mode: musl target: rv32gc-ilp32d - - mode: newlib - compiler: llvm - mode: musl compiler: llvm steps: @@ -40,7 +38,7 @@ jobs: TARGET_TUPLE=($(echo ${{ matrix.target }} | tr "-" "\n")) BUILD_TOOLCHAIN="./configure --prefix=/opt/riscv --with-arch=${TARGET_TUPLE[0]} --with-abi=${TARGET_TUPLE[1]}" if [ "${{ matrix.compiler }}" == "llvm" ]; then # build toolchain with llvm - $BUILD_TOOLCHAIN --enable-llvm --enable-linux + $BUILD_TOOLCHAIN --enable-llvm else $BUILD_TOOLCHAIN fi diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 97c7dec..bdda82e 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -55,8 +55,6 @@ jobs: exclude: - mode: musl target: rv32gc-ilp32d - - mode: newlib - compiler: llvm - mode: musl compiler: llvm steps: @@ -75,7 +73,7 @@ jobs: TARGET_TUPLE=($(echo ${{ matrix.target }} | tr "-" "\n")) BUILD_TOOLCHAIN="./configure --prefix=/opt/riscv --with-arch=${TARGET_TUPLE[0]} --with-abi=${TARGET_TUPLE[1]}" if [ "${{ matrix.compiler }}" == "llvm" ]; then # build toolchain with llvm - $BUILD_TOOLCHAIN --enable-llvm --enable-linux + $BUILD_TOOLCHAIN --enable-llvm else $BUILD_TOOLCHAIN fi @@ -101,7 +99,7 @@ jobs: *) MODE="elf";; esac - echo ::set-output name=TOOLCHAIN_NAME::riscv$BITS-$MODE-${{ matrix.os }}-nightly + echo ::set-output name=TOOLCHAIN_NAME::riscv$BITS-$MODE-${{ matrix.os }}-${{ matrix.compiler }}-nightly - uses: actions/upload-artifact@v2 with: |