Only dist llvm-objcopy if llvm tools are enabled
#134240
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
rustbot
added
S-waiting-on-review
|
Actually just one question. @cuviper in #131405 we had to
Will changing this for the dist flow prove problematic if the dist defaults + configurations we currently use combined regress that behavior? I think we definitely should be guarding the dist flow here, like your change does, I just wanted to double-check what our default behavior is. |
jieyouxu
added
S-waiting-on-author
|
The default still has llvm tools enabled, so you have to explicitly opt out -- I think that's fine for the issue you mention, although it doesn't look like we have any fallback on macOS if you built without it: rust/compiler/rustc_codegen_ssa/src/back/link.rs Lines 1110 to 1111 in 4847d6a For my part, I want to opt out in Linux distro builds, and it's not used there anyway. |
|
Right, that sounds reasonable to me. Thanks! @bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 13, 2024
Only dist `llvm-objcopy` if llvm tools are enabled This uses the same condition that rust-lang#132720 added in the compilation phase. r? `@jieyouxu`
This was referenced Dec 13, 2024
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 14, 2024
Only dist `llvm-objcopy` if llvm tools are enabled This uses the same condition that rust-lang#132720 added in the compilation phase. r? ```@jieyouxu```
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 14, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#134181 (Tweak multispan rendering to reduce output length) - rust-lang#134209 (validate `--skip` and `--exclude` paths) - rust-lang#134231 (rustdoc-search: fix mismatched path when parent re-exported twice) - rust-lang#134236 (crashes: more tests v2) - rust-lang#134240 (Only dist `llvm-objcopy` if llvm tools are enabled) - rust-lang#134244 (rustc_borrowck: Stop suggesting the invalid syntax `&mut raw const`) - rust-lang#134251 (A bunch of cleanups (part 2)) - rust-lang#134256 (Use a more precise span in placeholder_type_error_diag) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 14, 2024
Rollup merge of rust-lang#134240 - cuviper:dist-llvm-tools, r=jieyouxu Only dist `llvm-objcopy` if llvm tools are enabled This uses the same condition that rust-lang#132720 added in the compilation phase. r? ``@jieyouxu``
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.
This uses the same condition that #132720 added in the compilation phase.
r? @jieyouxu