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 /compiler/rustc_codegen_ssa | |
| 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 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs index 2bd5dfdce83..dd134ebbe6b 100644 --- a/compiler/rustc_codegen_ssa/src/back/linker.rs +++ b/compiler/rustc_codegen_ssa/src/back/linker.rs @@ -398,7 +398,7 @@ impl<'a> GccLinker<'a> { self.link_arg("-dylib"); // Note that the `osx_rpath_install_name` option here is a hack - // purely to support rustbuild right now, we should get a more + // purely to support bootstrap right now, we should get a more // principled solution at some point to force the compiler to pass // the right `-Wl,-install_name` with an `@rpath` in it. if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name { |