Setup cargo environment for cargo rustc --print#15026
Merged
epage merged 2 commits intorust-lang:masterfrom Jan 7, 2025
Merged
Setup cargo environment for cargo rustc --print#15026epage merged 2 commits intorust-lang:masterfrom
cargo rustc --print#15026epage merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
epage
approved these changes
Jan 7, 2025
Contributor
epage
left a comment
There was a problem hiding this comment.
Dug around and not seeing other places where we miss apply_env_config
epage
reviewed
Jan 7, 2025
| } | ||
| let target_info = TargetInfo::new(gctx, &build_config.requested_kinds, &rustc, *kind)?; | ||
| let mut process = rustc.process(); | ||
| apply_env_config(gctx, &mut process)?; |
Contributor
There was a problem hiding this comment.
(can add a test if desired, just tell me where)
See https://github.com/rust-lang/cargo/blob/master/tests/testsuite/rustc.rs
Looks like we have --print tests in there. Unsure about custom targets.
We generally ask that PRs are split into
- One commit that adds the test, showing the currently broken behavior (ie it passes)
- The fix commit that updates the test to pass with the change
This makes the diff between the two commits show the change in behavior
Member
Author
There was a problem hiding this comment.
Ah makes sense, will split the commit
6d18296 to
88797f4
Compare
88797f4 to
b7a0c9d
Compare
epage
approved these changes
Jan 7, 2025
Contributor
|
Thanks! |
This was referenced Jan 8, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 11, 2025
Update cargo 18 commits in fd784878cfa843e3e29a6654ecf564c62fae6735..088d496082726091024f1689c124a0c3dccbd775 2025-01-03 20:06:26 +0000 to 2025-01-10 20:10:21 +0000 - docs(reference): Fix PkgIdSpec kind docs (rust-lang/cargo#15049) - feat: Added warning when failing to update index cache (rust-lang/cargo#15014) - docs(ref): Fix the inverted logic about MSRV (rust-lang/cargo#15044) - chore(deps): update msrv (1 version) to v1.84 (rust-lang/cargo#15041) - Remove unnecessary into conversions (rust-lang/cargo#15042) - docs(contrib): Start guidelines for schema design (rust-lang/cargo#15037) - fix: emit warnings as warnings when learning rust target info (rust-lang/cargo#15036) - fix(schemas): Fix the `[lints]` JSON Schema (rust-lang/cargo#15035) - fix(schemas): Fix 'metadata' JSON Schema (rust-lang/cargo#15033) - shorten comment on Ord for SourceKind (rust-lang/cargo#15029) - Make `"C"` explicit in `extern "C"`. (rust-lang/cargo#15034) - simplify SourceID Ord/Eq (rust-lang/cargo#14980) - Setup cargo environment for `cargo rustc --print` (rust-lang/cargo#15026) - Avoid naming variables `str` (rust-lang/cargo#15025) - Bump to 0.87.0; update changelog (rust-lang/cargo#15022) - Update libgit2 to 1.9 (rust-lang/cargo#15018) - Remove condition on RUSTUP_WINDOWS_PATH_ADD_BIN (rust-lang/cargo#15017) - Fix https::self_signed_should_fail for macos (rust-lang/cargo#15016)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It turns out, running
cargo rustc --print cfg -Zunstable-options(and the like, #9357) fail with.cargo/config.tomlsetups likeresulting in
The reason for that is that cargo recognizes the target from the
.cargo/configand then implicitly passes that along to the spawned rustc process, but it does so without passing along the important environment that is required for the target tuple to make sense.(can add a test if desired, just tell me where)