Fix printing native CPU on cross-compiled compiler. #110668
Merged
Conversation
This file contains 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
|
r? @cuviper (rustbot has picked a reviewer for you, use r? to override) |
|
That's amusing, e.g. from an aarch64-linux host I can get this mismatch: ... because the toolchain was built in Rust CI on x86_64, so it thinks native is a match and reports the aarch64 CPU. It seems this is an LLVM bug: // FIXME: getProcessTriple is bogus. It returns the host LLVM was compiled on,
// rather than a valid triple for the current process.I think the default target is not necessarily the runtime host either, if you had an LLVM configured as a cross-compiler by default, but it's probably more often correct. |
cuviper
reviewed
Apr 22, 2023
7629401 to
e4e4110
Compare
|
@bors r+ rollup |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 24, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#110661 (rustdoc: clean up settings.css and settings.js) - rust-lang#110663 (Add note about change in bootstrap defaults) - rust-lang#110664 (stop `x fmt` formatting untracked directories) - rust-lang#110668 (Fix printing native CPU on cross-compiled compiler.) - rust-lang#110689 (Fix grammar in core::hint::unreachable_unchecked() docs) - rust-lang#110700 (Don't infer fn return type to return itself) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
If
rustcis cross-compiled from a different host, then the "native" entry inrustc --print=target-cpuswould not appear. There is a check in the printing code that will avoid printing the "native" entry if the user has passed--target. However, that check was comparing the--targetvalue with theLLVM_TARGET_TRIPLEwhich is the triple of the host thatrustcwas built on (the "build" target in Rust lingo), not the target it was being built for (the "host" in Rust lingo). This fixes it to use the target that LLVM was built for (which I'm pretty sure this is the correct function to determine that).This fixes the cpu listing for aarch64-apple-darwin which is built on CI using the x86_64-apple-darwin host.