Set CMAKE_SYSTEM_NAME for Linux targets
#109170
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
When bootstrap compiles native dependencies like LLVM, it should set CMAKE_SYSTEM_NAME for the target system; otherwise cmake may not identify that it is cross-compiling. In particular, when building a Linux rustc on a macOS host, cmake was including `-isysroot /path/to/macOS.sdk` options that caused things to break. By setting `CMAKE_SYSTEM_NAME=Linux` when building for Linux targets, the macOS SDK is no longer passed as sysroot to the compiler.
rustbot
added
S-waiting-on-review
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 20, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#109170 (Set `CMAKE_SYSTEM_NAME` for Linux targets) - rust-lang#109266 (rustdoc: Correctly merge import's and its target's docs in one more case) - rust-lang#109267 (Add tests for configure.py) - rust-lang#109273 (Make `slice::is_sorted_by` implementation nicer) - rust-lang#109277 (Fix generics_of for impl's RPITIT synthesized associated type) - rust-lang#109307 (Ignore `Inlined` spans when computing caller location.) - rust-lang#109364 (Only expect a GAT const param for `type_of` of GAT const arg) - rust-lang#109365 (Update mdbook) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jul 26, 2023
…e-system-name, r=ozkanonur Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly. Without `CMAKE_SYSTEM_NAME` set to the target a cross compile will generally fail. Related to rust-lang#109170.
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.
When bootstrap compiles native dependencies like LLVM, it should set
CMAKE_SYSTEM_NAMEfor the target system; otherwise cmake may not identify that it is cross-compiling.In particular, when building a Linux rustc on a macOS host, cmake was including
-isysroot /path/to/macOS.sdkoptions that caused things to break. By settingCMAKE_SYSTEM_NAME=Linuxwhen building for Linux targets, the macOS SDK is no longer passed as sysroot to the compiler.r? bootstrap