Skip to content

Commit cf3055d

Browse files
authored
Merge pull request #1276 from alexsifivetw/alexc/newlib-llvm
Add newlib toolchain with llvm to ci and release
2 parents 89268de + 9b8bc15 commit cf3055d

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
exclude:
2121
- mode: musl
2222
target: rv32gc-ilp32d
23-
- mode: newlib
24-
compiler: llvm
2523
- mode: musl
2624
compiler: llvm
2725
steps:
@@ -40,7 +38,7 @@ jobs:
4038
TARGET_TUPLE=($(echo ${{ matrix.target }} | tr "-" "\n"))
4139
BUILD_TOOLCHAIN="./configure --prefix=/opt/riscv --with-arch=${TARGET_TUPLE[0]} --with-abi=${TARGET_TUPLE[1]}"
4240
if [ "${{ matrix.compiler }}" == "llvm" ]; then # build toolchain with llvm
43-
$BUILD_TOOLCHAIN --enable-llvm --enable-linux
41+
$BUILD_TOOLCHAIN --enable-llvm
4442
else
4543
$BUILD_TOOLCHAIN
4644
fi

.github/workflows/nightly-release.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555
exclude:
5656
- mode: musl
5757
target: rv32gc-ilp32d
58-
- mode: newlib
59-
compiler: llvm
6058
- mode: musl
6159
compiler: llvm
6260
steps:
@@ -75,7 +73,7 @@ jobs:
7573
TARGET_TUPLE=($(echo ${{ matrix.target }} | tr "-" "\n"))
7674
BUILD_TOOLCHAIN="./configure --prefix=/opt/riscv --with-arch=${TARGET_TUPLE[0]} --with-abi=${TARGET_TUPLE[1]}"
7775
if [ "${{ matrix.compiler }}" == "llvm" ]; then # build toolchain with llvm
78-
$BUILD_TOOLCHAIN --enable-llvm --enable-linux
76+
$BUILD_TOOLCHAIN --enable-llvm
7977
else
8078
$BUILD_TOOLCHAIN
8179
fi

0 commit comments

Comments
 (0)