Skip to content

Fix line-tables-only on macOS 15 #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix line-tables-only on macOS 15 #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f162978
Revert "Use macos-14 image for testing (rust-lang/backtrace-rs#733)"
workingjubilee Sep 26, 2025
3dd14a8
Fix line-tables-only test on macOS 15
workingjubilee Sep 26, 2025
1cea408
comment on why not using -gline-tables-only
workingjubilee Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@ jobs:
rust: beta
- os: ubuntu-24.04
rust: nightly
- os: macos-14
- os: macos-latest
rust: stable
- os: macos-14
- os: macos-latest
rust: nightly
- os: macos-latest # macOS 15
rust: stable
- os: windows-latest
rust: stable-x86_64-msvc
- os: windows-latest
Expand Down Expand Up @@ -81,11 +79,7 @@ jobs:
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
- run: cargo test --manifest-path crates/without_debuginfo/Cargo.toml
- if: matrix.os != 'macos-latest'
run: cargo test --manifest-path crates/line-tables-only/Cargo.toml
# FIXME: This currently fails on macOS 15.
- if: matrix.os == 'macos-latest'
run: '! cargo test --manifest-path crates/line-tables-only/Cargo.toml'
- run: cargo test --manifest-path crates/line-tables-only/Cargo.toml

# Test debuginfo compression still works
- run: cargo test
Expand All @@ -101,18 +95,18 @@ jobs:
# Test that, on macOS, packed/unpacked debuginfo both work
- run: cargo clean && cargo test
# Test that, on macOS, packed/unpacked debuginfo both work
if: contains(matrix.os, 'macos')
if: matrix.os == 'macos-latest'
env:
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: unpacked
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: unpacked
- run: cargo clean && cargo test
if: contains(matrix.os, 'macos')
if: matrix.os == 'macos-latest'
env:
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
# Test that, on macOS, binaries with no UUID work
- run: cargo clean && cargo test
if: contains(matrix.os, 'macos')
if: matrix.os == 'macos-latest'
env:
RUSTFLAGS: "-C link-arg=-Wl,-no_uuid"

Expand Down
2 changes: 1 addition & 1 deletion crates/line-tables-only/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ fn main() {

cc::Build::new()
.opt_level(0)
.debug(false)
// Don't use -gline-tables-only: it breaks on platforms that don't use clang (Linux with gcc, etc.)
.flag("-g1")
Copy link
Contributor

@madsmtm madsmtm Sep 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Really should be:

Suggested change
.flag("-g1")
.flag("-gline-tables-only")

For clarity.

(If that is supported by all tested compiler versions)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried that.

Breaks on half the platforms because that's a clang-only option and gcc doesn't support it, and cc will opportunistically find and use gcc instead.

.file("src/callback.c")
.compile("libcallback.a");
Expand Down
Loading