diff options
| author | bors <bors@rust-lang.org> | 2020-06-08 23:52:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-08 23:52:04 +0000 |
| commit | 5d39f1fa2978e2c4532d002f4ce5121bc1c9a007 (patch) | |
| tree | 970a662f7fcdd48e8ae83c33d509278027cc4435 /src/librustc_codegen_ssa | |
| parent | fd4b177aabb9749dfb562c48e47379cea81dc277 (diff) | |
| parent | 9890107a813bbda09fc9dab503db25de44b3ad86 (diff) | |
Auto merge of #73147 - Dylan-DPC:rollup-9saqhj5, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #71842 (doc: make impl block collapsible if it has an associated constant) - #72912 (Add new E0758 error code) - #73008 (Update RELEASES.md) - #73090 (Use `LocalDefId` directly in `Resolver::export_map`) - #73118 (Improve the wording in documentation of std::mem::drop) - #73124 (Removed lifetime parameters from Explanation of E0207 ) - #73138 (Use shorthand linker strip arguments in order to support MacOS) - #73143 (Update books) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/linker.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs index d9fed998c92..b17c3678207 100644 --- a/src/librustc_codegen_ssa/back/linker.rs +++ b/src/librustc_codegen_ssa/back/linker.rs @@ -481,10 +481,12 @@ impl<'a> Linker for GccLinker<'a> { match strip { Strip::None => {} Strip::Debuginfo => { - self.linker_arg("--strip-debug"); + // MacOS linker does not support longhand argument --strip-debug + self.linker_arg("-S"); } Strip::Symbols => { - self.linker_arg("--strip-all"); + // MacOS linker does not support longhand argument --strip-all + self.linker_arg("-s"); } } } |
