about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMads Marquart <mads@marquart.dk>2024-10-10 04:03:48 +0200
committerMads Marquart <mads@marquart.dk>2024-10-10 04:03:48 +0200
commit09b634a4ba72336f1de2e3f5dccadd6e5bc3a011 (patch)
tree4a18112678843ba1605700a8dd689d71897245ba
parentfc0f045dd1fe9b0f14f504d0513623342be6f0dc (diff)
downloadrust-09b634a4ba72336f1de2e3f5dccadd6e5bc3a011.tar.gz
rust-09b634a4ba72336f1de2e3f5dccadd6e5bc3a011.zip
Fix hardcoded strip path when cross-compiling from Linux to Darwin
-rw-r--r--compiler/rustc_codegen_ssa/src/back/link.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index e7b1c63a822..34dc599e4fd 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1087,7 +1087,9 @@ fn link_natively(
     let strip = sess.opts.cg.strip;
 
     if sess.target.is_like_osx {
-        let stripcmd = "/usr/bin/strip";
+        // Use system `strip` when running on host macOS.
+        // <https://github.com/rust-lang/rust/pull/130781>
+        let stripcmd = if cfg!(target_os = "macos") { "/usr/bin/strip" } else { "strip" };
         match (strip, crate_type) {
             (Strip::Debuginfo, _) => {
                 strip_symbols_with_external_utility(sess, stripcmd, out_filename, Some("-S"))