Move add_apple_sdk out of add_pre_link_args.

ehuss · ehuss · commit 7420d7a98044 · 2020-09-26T19:12:38.000-07:00
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -1289,7 +1289,6 @@ fn add_pre_link_args(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor)`
`1289`	`1289`	`cmd.args(args);`
`1290`	`1290`	`}`
`1291`	`1291`	`cmd.args(&sess.opts.debugging_opts.pre_link_args);`
`1292`		`- add_apple_sdk(cmd, sess, flavor);`
`1293`	`1292`	`}`
`1294`	`1293`
`1295`	`1294`	`/// Add a link script embedded in the target, if applicable.`
`@@ -1525,6 +1524,9 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(`
`1525`	`1524`	`// NO-OPT-OUT, OBJECT-FILES-MAYBE, CUSTOMIZATION-POINT`
`1526`	`1525`	`add_pre_link_args(cmd, sess, flavor);`
`1527`	`1526`
	`1527`	`+ // NO-OPT-OUT, OBJECT-FILES-NO`
	`1528`	`+ add_apple_sdk(cmd, sess, flavor);`
	`1529`	`+`
`1528`	`1530`	`// NO-OPT-OUT`
`1529`	`1531`	`add_link_script(cmd, sess, tmpdir, crate_type);`
`1530`	`1532`