Skip to content

Commit 76b8a73

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

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

.cargo/config.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ 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: allow unresolved symbols (resolved at runtime by Node.js)
29+
[target.'cfg(all(target_os = "linux", target_env = "gnu"))']
30+
rustflags = ["-C", "link-args=-Wl,--warn-unresolved-symbols"]
31+
32+
# Additionally disable lld on x86_64 Linux (linker-features is stable only on x86_64)
33+
[target.x86_64-unknown-linux-gnu]
2934
rustflags = ["-C", "linker-features=-lld", "-C", "link-args=-Wl,--warn-unresolved-symbols"]
3035

3136
# To be able to run unit tests on Windows, support compilation to 'x86_64-pc-windows-msvc'.

.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

apps/oxfmt/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,10 @@ description.workspace = true
1616
workspace = true
1717

1818
[lib]
19-
crate-type = ["lib", "cdylib"]
19+
crate-type = ["cdylib", "lib"]
2020
path = "src/lib.rs"
2121
doctest = false
2222

23-
[[bin]]
24-
name = "oxfmt"
25-
path = "src/main.rs"
26-
test = false
27-
doctest = false
28-
2923
[dependencies]
3024
oxc_allocator = { workspace = true }
3125
oxc_diagnostics = { workspace = true }

0 commit comments

Comments
 (0)