bootstrap: only build crt{begin,end}.o when compiling to MUSL
#135836
+14
−2
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
only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors check the target before shelling out to the C compiler and tweak `make_run` to skip the actual C compilation when the target is not MUSL fixes rust-lang#135782
rustbot
added
S-waiting-on-review
|
This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp. This PR modifies If appropriate, please update |
onur-ozkan
reviewed
Jan 21, 2025
Comment on lines
+1305
to
+1309
| assert!( | ||
| self.target.needs_crt_begin_end(), | ||
| "tried to build crtbegin.o and crtend.o for the wrong target ({})", | ||
| self.target | ||
| ); |
There was a problem hiding this comment.
I think we should still be able to build this when invoked manually.
onur-ozkan
reviewed
Jan 21, 2025
| @@ -1295,11 +1295,19 @@ impl Step for CrtBeginEnd { | |||
| } | |||
|
|
|||
| fn make_run(run: RunConfig<'_>) { | |||
| run.builder.ensure(CrtBeginEnd { target: run.target }); | |||
| if run.target.needs_crt_begin_end() { | |||
There was a problem hiding this comment.
Can you try to modify default_condition inside should_run instead?
|
r? onur-ozkan |
|
@rustbot author |
rustbot
added
S-waiting-on-author
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.
only MUSL needs those objects and trying to compile them to other targets, e.g. Windows or macOS, will produce C compilation errors
check the target before shelling out to the C compiler and tweak
make_runto skip the actual C compilation when the target is not MUSLfixes #135782
see the linked issue for additional context