Skip to content

Commit

Permalink
Move add_apple_sdk out of add_pre_link_args.
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuss committed Sep 27, 2020
1 parent de725fe commit 7420d7a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion compiler/rustc_codegen_ssa/src/back/link.rs
Expand Up @@ -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.
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 7420d7a

Please sign in to comment.