From 7420d7a98044ea1bf727ab369cbc77232dd99694 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sat, 26 Sep 2020 19:12:38 -0700 Subject: [PATCH] Move add_apple_sdk out of add_pre_link_args. --- compiler/rustc_codegen_ssa/src/back/link.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 408a4a0cfed92..db61c726801d7 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1289,7 +1289,6 @@ fn add_pre_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) cmd.args(args); } cmd.args(&sess.opts.debugging_opts.pre_link_args); - add_apple_sdk(cmd, sess, flavor); } /// Add a link script embedded in the target, if applicable. @@ -1525,6 +1524,9 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>( // NO-OPT-OUT, OBJECT-FILES-MAYBE, CUSTOMIZATION-POINT add_pre_link_args(cmd, sess, flavor); + // NO-OPT-OUT, OBJECT-FILES-NO + add_apple_sdk(cmd, sess, flavor); + // NO-OPT-OUT add_link_script(cmd, sess, tmpdir, crate_type);