Skip to content

Commit 78a8c61

Browse files
committed
Don't use 'cross' for cross-compilation
Signed-off-by: yubiuser <[email protected]>
1 parent 8f0c7b2 commit 78a8c61

3 files changed

Lines changed: 14 additions & 4 deletions

File tree

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
[target.armv7-unknown-linux-gnueabihf]
3+
linker = "arm-linux-gnueabihf-gcc"

.github/workflows/test.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,15 @@ jobs:
233233
~/.cargo/git
234234
target
235235
key: ${{ runner.os }}-${{ matrix.target }}-${{ steps.get-rustc-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
236-
- name: Install cross
237-
run: cargo install cross || true
236+
237+
- name: Install the cross compiler targets
238+
run: rustup target add ${{ matrix.target }}
239+
240+
- name: Install cross compiler toolchain
241+
run: sudo apt-get install -y gcc-arm-linux-gnueabihf
242+
238243
- name: Build
239-
run: cross build --target ${{ matrix.target }} --no-default-features
244+
run: cargo build --verbose --target ${{ matrix.target }} --no-default-features
245+
246+
- name: Check binary
247+
run: file target/${{ matrix.target }}/debug/librespot

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
target
2-
.cargo
32
spotify_appkey.key
43
.vagrant/
54
.project

0 commit comments

Comments
 (0)