Skip to content

Commit ea60b48

Browse files
committed
fix(rust): Revert rustflags added in #14820
1 parent b4ebdf5 commit ea60b48

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.cargo/config.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ rustflags = ["-C", "target-feature=+crt-static"]
2525
[target.aarch64-pc-windows-msvc]
2626
rustflags = ["-C", "target-feature=+crt-static"]
2727

28-
[target.'cfg(target_os = "linux")']
28+
# Fix NAPI bindings on Linux by preventing use of lld linker and allowing unresolved symbols
29+
# x86_64: Use linker-features flag to disable lld (stable on x86_64)
30+
[target.x86_64-unknown-linux-gnu]
2931
rustflags = ["-C", "linker-features=-lld", "-C", "link-args=-Wl,--warn-unresolved-symbols"]
3032

33+
# aarch64: linker-features is unstable, so skip it and only allow unresolved symbols
34+
[target.aarch64-unknown-linux-gnu]
35+
rustflags = ["-C", "link-args=-Wl,--warn-unresolved-symbols"]
36+
3137
# To be able to run unit tests on Windows, support compilation to 'x86_64-pc-windows-msvc'.
3238
# Use Hybrid CRT to reduce the size of the binary (Coming by default with Windows 10 and later versions).
3339
[target.'cfg(target_os = "windows")']

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- run: git diff --exit-code # Must commit everything
3232

3333
test-ubuntu-aarch64:
34-
if: ${{ github.ref_name == 'main' }}
34+
# if: ${{ github.ref_name == 'main' }}
3535
name: Test Linux ARM64
3636
runs-on: ubuntu-24.04-arm
3737
steps:
@@ -47,7 +47,7 @@ jobs:
4747
- run: git diff --exit-code # Must commit everything
4848

4949
test-mac: # Separate job to save a job on PRs
50-
if: ${{ github.ref_name == 'main' }}
50+
# if: ${{ github.ref_name == 'main' }}
5151
name: Test Mac
5252
runs-on: macos-latest
5353
steps:
@@ -63,7 +63,7 @@ jobs:
6363
- run: git diff --exit-code # Must commit everything
6464

6565
test-windows:
66-
if: ${{ github.ref_name == 'main' }}
66+
# if: ${{ github.ref_name == 'main' }}
6767
name: Test Windows
6868
runs-on: windows-latest
6969
steps:
@@ -111,7 +111,7 @@ jobs:
111111
shell: bash
112112

113113
test-big-endian:
114-
if: ${{ github.ref_name == 'main' }}
114+
# if: ${{ github.ref_name == 'main' }}
115115
name: Test big-endian # s390x-unknown-linux-gnu is a big-endian
116116
runs-on: ubuntu-latest
117117
steps:
@@ -214,7 +214,7 @@ jobs:
214214
test-napi-windows:
215215
name: Test NAPI (windows)
216216
runs-on: windows-latest
217-
if: ${{ github.ref_name == 'main' }}
217+
# if: ${{ github.ref_name == 'main' }}
218218
steps:
219219
- name: Enable long paths on Windows
220220
run: git config --system core.longpaths true

0 commit comments

Comments
 (0)