Skip to content

Commit

Permalink
Auto merge of #49212 - kyrias:strip-debug-no-debuginfo, r=michaelwoer…
Browse files Browse the repository at this point in the history
…ister

Pass --strip-debug to GccLinker when building without debuginfo

C.f. #46034

---

This brings a hello-world built by passing rustc no command line options from 2.9M to 592K on Linux.

(This might need to special case MacOS or Windows, not sure if the linkers there support `--strip-debug`, and there is an annoying lack of dependable docs for the linkers there.)
  • Loading branch information
bors committed Mar 25, 2018
2 parents 482a913 + 2f0dd4a commit d351805
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/librustc/session/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
"format compiler diagnostics in a way that's better suitable for UI testing"),
embed_bitcode: bool = (false, parse_bool, [TRACKED],
"embed LLVM bitcode in object files"),
strip_debuginfo_if_disabled: Option<bool> = (None, parse_opt_bool, [TRACKED],
"tell the linker to strip debuginfo when building without debuginfo enabled."),
}

pub fn default_lib_output() -> CrateType {
Expand Down
13 changes: 12 additions & 1 deletion src/librustc_trans/back/linker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,18 @@ impl<'a> Linker for GccLinker<'a> {
}

fn debuginfo(&mut self) {
// Don't do anything special here for GNU-style linkers.
match self.sess.opts.debuginfo {
DebugInfoLevel::NoDebugInfo => {
// If we are building without debuginfo enabled and we were called with
// `-Zstrip-debuginfo-if-disabled=yes`, tell the linker to strip any debuginfo
// found when linking to get rid of symbols from libstd.
match self.sess.opts.debugging_opts.strip_debuginfo_if_disabled {
Some(true) => { self.linker_arg("-S"); },
_ => {},
}
},
_ => {},
};
}

fn no_default_libraries(&mut self) {
Expand Down

0 comments on commit d351805

Please sign in to comment.