diff options
| author | bors <bors@rust-lang.org> | 2024-07-14 05:41:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-14 05:41:24 +0000 |
| commit | 8a63c84af5e7a201239e87d2175128907495b028 (patch) | |
| tree | 3addd31efeb65b5465f8751200cf366347027f95 /src/ci/scripts | |
| parent | 4cd8dc63353a9859e3e3c2d5296024c810fc0923 (diff) | |
| parent | 6a3566c2b01b1d31ac97f231636b2bef1750051c (diff) | |
| download | rust-8a63c84af5e7a201239e87d2175128907495b028.tar.gz rust-8a63c84af5e7a201239e87d2175128907495b028.zip | |
Auto merge of #127706 - workingjubilee:rollup-d07ij30, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #122300 (Add FileCheck annotations to mir-opt/dest-prop tests) - #127434 (use "bootstrap" instead of "rustbuild" in comments and docs) - #127477 (Clear `inner_attr_ranges` regularly.) - #127558 (More attribute cleanups) - #127659 (Use ManuallyDrop in BufWriter::into_parts) - #127671 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 8)) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-clang.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/scripts/install-clang.sh b/src/ci/scripts/install-clang.sh index 24b9904d65c..6103aa61248 100755 --- a/src/ci/scripts/install-clang.sh +++ b/src/ci/scripts/install-clang.sh @@ -40,7 +40,7 @@ if isMacOS; then # our own clang can figure out the correct include path on its own. ciCommandSetEnv SDKROOT "$(xcrun --sdk macosx --show-sdk-path)" - # Configure `AR` specifically so rustbuild doesn't try to infer it as + # Configure `AR` specifically so bootstrap doesn't try to infer it as # `clang-ar` by accident. ciCommandSetEnv AR "ar" elif isWindows && ! isKnownToBeMingwBuild; then |