Auto merge of #144829 - Kivooeo:strip-flag, r=<try>

rust-bors[bot] · web-flow · commit 418d9bc759b0 · 2025-08-03T09:45:16.000Z
Use full flag name in strip command for Darwin

try-job: test-various
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1011,11 +1011,12 @@ fn link_natively(
             (Strip::Debuginfo, _) => {
                 strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-debug"])
             }
-            // Per the manpage, `-x` is the maximum safe strip level for dynamic libraries. (#93988)
+
+            // Per the manpage, --discard-all is the maximum safe strip level for dynamic libraries. (#93988)
             (
                 Strip::Symbols,
                 CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro | CrateType::Sdylib,
-            ) => strip_with_external_utility(sess, stripcmd, out_filename, &["-x"]),
+            ) => strip_with_external_utility(sess, stripcmd, out_filename, &["--discard-all"]),
             (Strip::Symbols, _) => {
                 strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-all"])
             }

Original file line number	Diff line number	Diff line change
`@@ -1011,11 +1011,12 @@ fn link_natively(`
`1011`	`1011`	`(Strip::Debuginfo, _) => {`
`1012`	`1012`	`strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-debug"])`
`1013`	`1013`	`}`
`1014`		- // Per the manpage, `-x` is the maximum safe strip level for dynamic libraries. (#93988)
	`1014`	`+`
	`1015`	`+ // Per the manpage, --discard-all is the maximum safe strip level for dynamic libraries. (#93988)`
`1015`	`1016`	`(`
`1016`	`1017`	`Strip::Symbols,`
`1017`	`1018`	`CrateType::Dylib \| CrateType::Cdylib \| CrateType::ProcMacro \| CrateType::Sdylib,`
`1018`		`- ) => strip_with_external_utility(sess, stripcmd, out_filename, &["-x"]),`
	`1019`	`+ ) => strip_with_external_utility(sess, stripcmd, out_filename, &["--discard-all"]),`
`1019`	`1020`	`(Strip::Symbols, _) => {`
`1020`	`1021`	`strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-all"])`
`1021`	`1022`	`}`