diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-11-19 22:24:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-19 22:24:47 +0100 |
| commit | 49aec06ab0df5164ea2fddb4cac317549cf369cb (patch) | |
| tree | 5a7746c7ada9c81be3ae898ff4fa74465fe3b3d3 /src | |
| parent | 841243f3199a0eeb1dd92b28f55286cddd15482c (diff) | |
| parent | 4b5c88301bcc20de9fa58b7390d78d596f7d7223 (diff) | |
| download | rust-49aec06ab0df5164ea2fddb4cac317549cf369cb.tar.gz rust-49aec06ab0df5164ea2fddb4cac317549cf369cb.zip | |
Rollup merge of #133207 - jieyouxu:macos-objcopy, r=Kobzol,bjorn3
Default-enable `llvm_tools_enabled` when no `config.toml` is present Fixes #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
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/config/config.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/src/utils/change_tracker.rs | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs index 95b1303fa71..e706aba977b 100644 --- a/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs @@ -1255,6 +1255,10 @@ impl Config { }, out: PathBuf::from("build"), + // This is needed by codegen_ssa on macOS to ship `llvm-objcopy` aliased to + // `rust-objcopy` to workaround bad `strip`s on macOS. + llvm_tools_enabled: true, + ..Default::default() } } diff --git a/src/bootstrap/src/utils/change_tracker.rs b/src/bootstrap/src/utils/change_tracker.rs index 1d05f94e3be..7f62ffb20db 100644 --- a/src/bootstrap/src/utils/change_tracker.rs +++ b/src/bootstrap/src/utils/change_tracker.rs @@ -300,4 +300,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[ severity: ChangeSeverity::Info, summary: "`download-rustc='if-unchanged'` is now a default option for library profile.", }, + ChangeInfo { + change_id: 133207, + severity: ChangeSeverity::Info, + summary: "`rust.llvm-tools` is now enabled by default when no `config.toml` is provided.", + }, ]; |
