Skip to content
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

Jump to bottom

[bootstrap] Distribute split debuginfo if present #138321

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[bootstrap] Distribute split debuginfo if present #138321

wants to merge 1 commit into from
+255 −99

Conversation

wesleywiser
Copy link
Member

If debuginfo has been requested in config.toml, it should be packaged alongside the appropriate binary when running x.py dist.

Currently, this is only implemented for msvc environments where split debuginfo is (basically) the only option. I've tested that this correctly packages the .pdb for each binary in the various dist packages.

@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2025

r? @onur-ozkan

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 10, 2025
@onur-ozkan
Copy link
Member

There is a merge conflict.

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2025
@bors
Copy link
Contributor

bors commented Mar 11, 2025

☔ The latest upstream changes (presumably #135651) made this pull request unmergeable. Please resolve the merge conflicts.

@wesleywiser wesleywiser force-pushed the bootstrap_package_pdbs branch from f15261b to 8924f63 Compare March 14, 2025 19:44
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@wesleywiser wesleywiser force-pushed the bootstrap_package_pdbs branch from 8924f63 to 3e466e3 Compare March 14, 2025 20:09
@onur-ozkan
Copy link
Member

Looks awesome, thank you!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 14, 2025

📌 Commit 3e466e3 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2025
@bors
Copy link
Contributor

bors commented Mar 15, 2025

☔ The latest upstream changes (presumably #138523) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 15, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 17, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 17, 2025
@bors
Auto merge of rust-lang#138611 - matthiaskrgr:rollup-hmjbqva, r=matth…
43a2e9d 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133870 (Stabilize `asm_goto` feature gate)
 - rust-lang#137449 (Denote `ControlFlow` as `#[must_use]`)
 - rust-lang#137465 (mir_build: Avoid some useless work when visiting "primary" bindings)
 - rust-lang#138349 (Emit function declarations for functions with `#[linkage="extern_weak"]`)
 - rust-lang#138412 (Install licenses into `share/doc/rust/licenses`)
 - rust-lang#138577 (rustdoc-json: Don't also include `#[deprecated]` in `Item::attrs`)
 - rust-lang#138588 (Avoid double lowering of idents)

Failed merges:

 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)

r? `@ghost`
`@rustbot` modify labels: rollup
@wesleywiser
[bootstrap] Distribute split debuginfo if present
6362851 
If debuginfo has been requested in `config.toml`, it should be packaged
alongside the appropriate binary when running `x.py dist`.

Currently, this is only implemented for msvc environments where split
debuginfo is (basically) the only option. I've tested that this
correctly packages the `.pdb` for each binary in the various dist
packages.
@wesleywiser wesleywiser force-pushed the bootstrap_package_pdbs branch from 3e466e3 to 6362851 Compare March 17, 2025 23:21
@wesleywiser
Copy link
Member Author

Rebased

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 17, 2025
@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 18, 2025

📌 Commit 6362851 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 20, 2025
@jieyouxu
Rollup merge of rust-lang#138321 - wesleywiser:bootstrap_package_pdbs…
6fe32cc 
…, r=onur-ozkan

[bootstrap] Distribute split debuginfo if present

If debuginfo has been requested in `config.toml`, it should be packaged alongside the appropriate binary when running `x.py dist`.

Currently, this is only implemented for msvc environments where split debuginfo is (basically) the only option. I've tested that this correctly packages the `.pdb` for each binary in the various dist packages.
@jieyouxu jieyouxu mentioned this pull request Mar 20, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#138733 - jieyouxu:rollup-hcgwhei, r=jieyouxu
765a6ca 
Rollup of 15 pull requests

Successful merges:

 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)
 - rust-lang#138364 (ports the compiler test cases to new rust_intrinsic format)
 - rust-lang#138410 (Couple mir building cleanups)
 - rust-lang#138435 (Add support for postfix yield expressions)
 - rust-lang#138536 (stable_mir: Add `MutMirVisitor`)
 - rust-lang#138623 ([bootstrap] Use llvm_runtimes for compiler-rt)
 - rust-lang#138650 (Optimize `io::Write::write_fmt` for constant strings)
 - rust-lang#138652 (Reintroduce remote-test support in run-make tests)
 - rust-lang#138685 (Use `Option<Ident>` for lowered param names.)
 - rust-lang#138694 (Fix: add ohos target notes)
 - rust-lang#138700 (Suggest `-Whelp` when pass `--print lints` to rustc)
 - rust-lang#138709 (Update GCC submodule)
 - rust-lang#138724 (Check attrs: Don't try to retrieve the name of list stems)
 - rust-lang#138731 (coverage: Add LLVM plumbing for expansion regions)
 - rust-lang#138732 (Use `def_path_str` for def id arg in `UnsupportedOpInfo`)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Mar 22, 2025
@tgross35
Rollup merge of rust-lang#138321 - wesleywiser:bootstrap_package_pdbs…
c6813b0 
…, r=onur-ozkan

[bootstrap] Distribute split debuginfo if present

If debuginfo has been requested in `config.toml`, it should be packaged alongside the appropriate binary when running `x.py dist`.

Currently, this is only implemented for msvc environments where split debuginfo is (basically) the only option. I've tested that this correctly packages the `.pdb` for each binary in the various dist packages.
@tgross35 tgross35 mentioned this pull request Mar 22, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2025
@bors
Auto merge of rust-lang#138827 - tgross35:rollup-agm26cd, r=tgross35
ab162c6 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#137736 (Don't attempt to export compiler-builtins symbols from rust dylibs)
 - rust-lang#138236 (uefi: Add OwnedEvent abstraction)
 - rust-lang#138321 ([bootstrap] Distribute split debuginfo if present)
 - rust-lang#138410 (Couple mir building cleanups)
 - rust-lang#138490 (Forward `stream_position` in `Arc<File>` as well)
 - rust-lang#138535 (Cleanup `LangString::parse`)
 - rust-lang#138536 (stable_mir: Add `MutMirVisitor`)
 - rust-lang#138580 (resolve: Avoid some unstable iteration 2)
 - rust-lang#138601 (add FCW to warn about wasm ABI transition)
 - rust-lang#138631 (Update test for SGX now implementing `read_buf`)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan

Assignees

@onur-ozkan onur-ozkan

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@wesleywiser @rustbot @onur-ozkan @bors @rust-log-analyzer