Browse Source
Merge branch 'riscv-collab:master' into master
pull/1283/head
Tommy Murphy
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
7 deletions
-
.github/workflows/build.yaml
-
.github/workflows/nightly-release.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 |
|
|
|
|
|
|
|
@ -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: |
|
|
|
|
