Skip to content

Commit 8c08569

Browse files
committed
fix: comment out macOS-specific linker settings and limit test threads to 1
1 parent 6c278aa commit 8c08569

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.cargo/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ rustflags = ["-Clink-arg=-fuse-ld=lld"]
99

1010
# NOTE: you must manually install https://github.com/michaeleisel/zld on mac. you can easily do this with the "brew" package manager:
1111
# `brew install michaeleisel/zld/zld`
12-
[target.x86_64-apple-darwin]
13-
rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld"]
12+
# [target.x86_64-apple-darwin]
13+
# rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld"]
1414

15-
[target.aarch64-apple-darwin]
16-
rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld"]
15+
# [target.aarch64-apple-darwin]
16+
# rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld"]
1717

1818
[target.x86_64-pc-windows-msvc]
1919
linker = "rust-lld.exe"

.github/workflows/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ jobs:
2121
- macOS-latest
2222
- windows-latest
2323
runs-on: ${{ matrix.os }}
24+
env:
25+
# Limit test threads to 1 to show test name before execution.
26+
RUST_TEST_THREADS: 1
2427

2528
steps:
2629
- name: Set git autocrlf to input

justfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ test:
3838
rustc --version
3939
cargo --version
4040

41-
# Limit test threads to 1 to show test name before execution.
42-
RUST_TEST_THREADS=1 cargo test --verbose {{FEATURES}}
41+
cargo test --verbose {{FEATURES}}
4342

4443
lint:
4544
rustc --version

0 commit comments

Comments
 (0)