bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix up setting strip = true in Cargo.toml makes build scripts fail in release mode on MacOS

Browse source
This commit is contained in:
monkeydbobo 2024-09-24 19:51:11 +08:00
parent 4cadeda932
commit 802bf71ece
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -1087,16 +1087,17 @@ fn link_natively(
let strip = sess.opts.cg.strip; let strip = sess.opts.cg.strip;
if sess.target.is_like_osx { if sess.target.is_like_osx {
let stripcmd = "/usr/bin/strip";
match (strip, crate_type) { match (strip, crate_type) {
(Strip::Debuginfo, _) => { (Strip::Debuginfo, _) => {
strip_symbols_with_external_utility(sess, "strip", out_filename, Some("-S")) strip_symbols_with_external_utility(sess, stripcmd, out_filename, Some("-S"))
} }
// Per the manpage, `-x` is the maximum safe strip level for dynamic libraries. (#93988) // Per the manpage, `-x` is the maximum safe strip level for dynamic libraries. (#93988)
(Strip::Symbols, CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro) => { (Strip::Symbols, CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro) => {
strip_symbols_with_external_utility(sess, "strip", out_filename, Some("-x")) strip_symbols_with_external_utility(sess, stripcmd, out_filename, Some("-x"))
} }
(Strip::Symbols, _) => { (Strip::Symbols, _) => {
strip_symbols_with_external_utility(sess, "strip", out_filename, None) strip_symbols_with_external_utility(sess, stripcmd, out_filename, None)
} }
(Strip::None, _) => {} (Strip::None, _) => {}
} }