Skip to content

Commit 2d70c1f

Browse files
committed
fix armv7-unknown-linux-gnueabihf
1 parent 1bdac3f commit 2d70c1f

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.cargo/config.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
linker = "aarch64-linux-musl-gcc"
33
rustflags = ["-C", "target-feature=-crt-static"]
44
[target.x86_64-pc-windows-msvc]
5-
rustflags = ["-C", "target-feature=+crt-static"]
6-
[target.armv7-unknown-linux-gnueabihf]
7-
linker = "arm-linux-gnueabihf-gcc"
5+
rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/CI.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ jobs:
9292
yarn build --target aarch64-unknown-linux-gnu
9393
- host: ubuntu-latest
9494
target: armv7-unknown-linux-gnueabihf
95-
build: yarn build --target armv7-unknown-linux-gnueabihf
95+
setup: |
96+
sudo apt-get update
97+
sudo apt-get install gcc-arm-linux-gnueabihf -y
98+
build: |
99+
yarn build --target armv7-unknown-linux-gnueabihf
96100
- host: ubuntu-latest
97101
target: aarch64-linux-android
98102
build: yarn build --target aarch64-linux-android
@@ -156,10 +160,6 @@ jobs:
156160
with:
157161
node-version: 22
158162
cache: yarn
159-
- name: Setup Zig
160-
uses: goto-bus-stop/setup-zig@v2
161-
with:
162-
version: 0.11.0
163163
- name: Install NASM
164164
if: runner.os == 'Windows'
165165
run: choco install nasm
@@ -179,6 +179,10 @@ jobs:
179179
.cargo-cache
180180
target/
181181
key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
182+
- uses: goto-bus-stop/setup-zig@v2
183+
if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
184+
with:
185+
version: 0.14.0
182186
- name: Setup toolchain
183187
run: ${{ matrix.settings.setup }}
184188
if: ${{ matrix.settings.setup }}

0 commit comments

Comments
 (0)