-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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.
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
Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly. #113996
Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly. #113996
Conversation
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp. |
Given that this list is likely a.) not complete and b.) will grow over time, would it make sense to call |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM after the update of
rust/src/bootstrap/download-ci-llvm-stamp
Lines 1 to 4 in 8771282
Change this file to make users of the `download-ci-llvm` configuration download | |
a new version of LLVM from CI, even if the LLVM submodule hasn’t changed. | |
Last change is for: https://github.com/rust-lang/rust/pull/112931 |
I don't think it makes any difference since it's still a string comparison |
Ah I was thinking mainly in terms of legibility, however that wouldn't account for platforms where the triplet is actually a quadruplet (e.g. Anyways the other thing that comes to mind is printing a warning if } else {
eprintln!("could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail")
} |
This seems better. Can you add that |
CMAKE_SYSTEM_NAME is defined on a cross build if the target is recognized. Without this explicit definition cmake will assume that we're building for the host platform which can bring in unwanted compiler and linker flags. Also, add a warning on cross builds with unknown target to aid in cross builds for future platforms.
cb5a7ed
to
a0538db
Compare
Thanks a lot! @bors r+ rollup |
⌛ Testing commit a0538db with merge 2395c2294bc198f37c162a70f516a6e2b1be2aa6... |
The job Click to see the possible cause of the failure (guessed by this bot)
|
💔 Test failed - checks-actions |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#101994 (rand: freebsd update, using getrandom.) - rust-lang#113930 (Add Param and Bound ty to SMIR) - rust-lang#113942 (Squelch a noisy rustc_expand unittest) - rust-lang#113996 (Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.) - rust-lang#114070 (Add `sym::iter_mut` + `sym::as_mut_ptr` for Clippy) - rust-lang#114073 (Remove -Z diagnostic-width) - rust-lang#114090 (compiletest: remove ci-specific remap-path-prefix) r? `@ghost` `@rustbot` modify labels: rollup
Without
CMAKE_SYSTEM_NAME
set to the target a cross compile will generally fail. Related to #109170.