Skip to content

Commit 3f21622

Browse files
committed
Try fixing linux linker args
1 parent ab9f949 commit 3f21622

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

.cargo/config.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
# 173K, loading works
1818
# Conclusion: -lgcc_eh has no effect when using -Z build-std.
1919

20-
[target.x86_64-unknown-linux-gnu]
20+
[target.'cfg(target_os = "linux")']
2121
rustflags = [
2222
"-C", "link-arg=-lgcc_eh",
2323
]
2424

25-
[target.i686-unknown-linux-gnu]
26-
rustflags = [
27-
"-C", "link-arg=-lgcc_eh",
28-
]
25+
[target.x86_64-unknown-linux-gnu]
26+
linker = "x86_64-linux-gnu-gcc"
2927

3028
[target.aarch64-unknown-linux-gnu]
3129
linker = "aarch64-linux-gnu-gcc"
32-
rustflags = [
33-
"-C", "link-arg=-lgcc_eh",
34-
]
3530

31+
[target.armv7-unknown-linux-gnueabihf]
32+
linker = "arm-linux-gnueabihf-gcc"
33+
34+
[target.riscv64gc-unknown-linux-gnu]
35+
linker = "riscv64-linux-gnu-gcc"
3636

3737
# For iOS and macOS, we need to specify the minimum/target version.
3838
# This must match the versions in the podspec file.

.github/workflows/tests.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
libs_macos:
1919
name: Building macOS libraries
2020
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
21-
runs-on: ubuntu-latest
21+
runs-on: macos-latest
2222
steps:
2323
- uses: actions/checkout@v4
2424
with:
@@ -29,7 +29,7 @@ jobs:
2929
libs_windows:
3030
name: Building Windows libraries
3131
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
32-
runs-on: ubuntu-latest
32+
runs-on: windows-latest
3333
steps:
3434
- uses: actions/checkout@v4
3535
with:
@@ -73,20 +73,18 @@ jobs:
7373
- name: Build XCFramework
7474
uses: ./.github/actions/xcframework
7575

76-
build:
77-
name: Testing on ${{ matrix.os }}
76+
rust_unit_tests:
77+
name: Rust unit tests on ${{ matrix.os }}
7878
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
7979
runs-on: ${{ matrix.os }}
8080
strategy:
8181
fail-fast: false
8282
matrix:
8383
os: [ubuntu-24.04, macos-latest]
84-
8584
steps:
8685
- uses: actions/checkout@v4
8786
with:
8887
submodules: true
89-
- uses: dart-lang/setup-dart@v1
9088

9189
- name: Ubuntu setup
9290
if: matrix.os == 'ubuntu-24.04'
@@ -124,6 +122,23 @@ jobs:
124122
run: |
125123
./target/release/sqlite3 ":memory:" ".load ./target/release/libpowersync" "select powersync_rs_version()"
126124
125+
build:
126+
name: Testing on ${{ matrix.os }}
127+
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
128+
runs-on: ${{ matrix.os }}
129+
needs: [libs_linux, libs_macos]
130+
strategy:
131+
fail-fast: false
132+
matrix:
133+
os: [ubuntu-24.04, ubuntu-arm64, macos-latest, windows-latest]
134+
135+
steps:
136+
- uses: actions/checkout@v4
137+
with:
138+
submodules: true
139+
140+
- uses: dart-lang/setup-dart@v1
141+
127142
- uses: actions/cache@v4
128143
id: sqlite_build
129144
with:

0 commit comments

Comments
 (0)