about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-05-17 05:58:54 +0000
committerbors <bors@rust-lang.org>2020-05-17 05:58:54 +0000
commite7f230dfd2a4bce3d79e5210e8363f626d90d688 (patch)
tree8ebda1c83eedc1fa45d67c0b6c8500e600d8d281
parent09739c22db948a7a2ed13e8f466cb22adb1d7818 (diff)
parent15c22922989774cb2102fc5c52f078f0f899cc62 (diff)
downloadrust-e7f230dfd2a4bce3d79e5210e8363f626d90d688.tar.gz
rust-e7f230dfd2a4bce3d79e5210e8363f626d90d688.zip
Auto merge of #72208 - tmandry:fix-fuchsia-solink, r=Mark-Simulacrum
Don't pass --dynamic-linker for Fuchsia dylibs

This was causing a PT_INTERP header in Fuchsia dylibs (implying that
they're executable when they're not).

r? @Mark-Simulacrum
cc @frobtech @petrhosek
-rw-r--r--src/librustc_codegen_ssa/back/link.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index a54160cdd71..ce158fb07da 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1447,7 +1447,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
     add_link_script(cmd, sess, tmpdir, crate_type);
 
     // NO-OPT-OUT, OBJECT-FILES-NO, AUDIT-ORDER
-    if sess.target.target.options.is_like_fuchsia {
+    if sess.target.target.options.is_like_fuchsia && crate_type == CrateType::Executable {
         let prefix = match sess.opts.debugging_opts.sanitizer {
             Some(Sanitizer::Address) => "asan/",
             _ => "",