Default-enable llvm_tools_enabled when no config.toml is present#133207
Merged
bors merged 3 commits intorust-lang:masterfrom Nov 20, 2024
Merged
Default-enable llvm_tools_enabled when no config.toml is present#133207bors merged 3 commits intorust-lang:masterfrom
llvm_tools_enabled when no config.toml is present#133207bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
|
This PR modifies If appropriate, please update |
Member
Does this disable the option? rust/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh Lines 32 to 33 in e6c1e14 |
Kobzol
reviewed
Nov 19, 2024
2c39c2b to
7059262
Compare
Collaborator
|
Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 |
Member
Author
I modified the config there to explicitly disable llvm tools. |
Member
Author
|
Changes since last review (diff):
|
bjorn3
reviewed
Nov 19, 2024
7059262 to
4b5c883
Compare
Member
|
LGTM, if bjorn3 is ok with the latest change. |
bjorn3
approved these changes
Nov 19, 2024
Member
Author
|
@bors r=Kobzol,bjorn3 rollup |
Collaborator
wesleywiser
approved these changes
Nov 19, 2024
Member
wesleywiser
left a comment
There was a problem hiding this comment.
I can confirm this fixes building without config.toml for me. Thanks @jieyouxu! 💛
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 19, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#123947 (Add vec_deque::Iter::as_slices and friends) - rust-lang#125405 (Add std::thread::add_spawn_hook.) - rust-lang#133175 (ci: use free runner in dist-i686-msvc) - rust-lang#133183 (Mention std::fs::remove_dir_all in std::fs::remove_dir) - rust-lang#133188 (Add `visit` methods to ast nodes that already have `walk`s on ast visitors) - rust-lang#133201 (Remove `TokenKind::InvalidPrefix`) - rust-lang#133207 (Default-enable `llvm_tools_enabled` when no `config.toml` is present) - rust-lang#133213 (Correct the tier listing of `wasm32-wasip2`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 20, 2024
Rollup merge of rust-lang#133207 - jieyouxu:macos-objcopy, r=Kobzol,bjorn3 Default-enable `llvm_tools_enabled` when no `config.toml` is present Fixes rust-lang#133195. cc `@wesleywiser` could you double check if with this patch and no `config.toml` that you can run `./x test tests/ui --stage 1`? `llvm-objcopy` is usually required by cg_ssa on macOS to workaround bad `strip`s. cc `@bjorn3` I hope this doesn't break cg_clif... r? bootstrap
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Fixes #133195. cc @wesleywiser could you double check if with this patch and no
config.tomlthat you can run./x test tests/ui --stage 1?llvm-objcopyis usually required by cg_ssa on macOS to workaround badstrips.cc @bjorn3 I hope this doesn't break cg_clif...
r? bootstrap