Refactor rust(do)c linker flags · rust-lang/rust@d9f9e67 (original) (raw)

`@@ -29,8 +29,8 @@ use crate::utils;

`

29

29

`use crate::utils::cache::{Interned, INTERNER};

`

30

30

`use crate::utils::exec::BootstrapCommand;

`

31

31

`use crate::utils::helpers::{

`

32

``

`-

self, add_link_lib_path, add_rustdoc_cargo_lld_flags, add_rustdoc_lld_flags, dylib_path,

`

33

``

`-

dylib_path_var, output, t, target_supports_cranelift_backend, up_to_date, LldThreads,

`

``

32

`+

self, add_link_lib_path, add_rustdoc_cargo_linker_args, dylib_path, dylib_path_var,

`

``

33

`+

linker_args, output, t, target_supports_cranelift_backend, up_to_date, LldThreads,

`

34

34

`};

`

35

35

`use crate::utils::render_tests::{add_flags_and_try_run_tests, try_run_tests};

`

36

36

`use crate::{envify, CLang, DocTests, GitRepo, Mode};

`

`@@ -277,7 +277,7 @@ impl Step for Cargotest {

`

277

277

`.args(builder.config.test_args())

`

278

278

`.env("RUSTC", builder.rustc(compiler))

`

279

279

`.env("RUSTDOC", builder.rustdoc(compiler));

`

280

``

`-

add_rustdoc_cargo_lld_flags(&mut cmd, builder, compiler.host, LldThreads::No);

`

``

280

`+

add_rustdoc_cargo_linker_args(&mut cmd, builder, compiler.host, LldThreads::No);

`

281

281

` builder.run_delaying_failure(cmd);

`

282

282

`}

`

283

283

`}

`

`@@ -863,7 +863,7 @@ impl Step for RustdocTheme {

`

863

863

`.env("CFG_RELEASE_CHANNEL", &builder.config.channel)

`

864

864

`.env("RUSTDOC_REAL", builder.rustdoc(self.compiler))

`

865

865

`.env("RUSTC_BOOTSTRAP", "1");

`

866

``

`-

add_rustdoc_lld_flags(&mut cmd, builder, self.compiler.host, LldThreads::No);

`

``

866

`+

cmd.args(linker_args(builder, self.compiler.host, LldThreads::No));

`

867

867

``

868

868

` builder.run_delaying_failure(&mut cmd);

`

869

869

`}

`

`@@ -1039,7 +1039,7 @@ impl Step for RustdocGUI {

`

1039

1039

` cmd.env("RUSTDOC", builder.rustdoc(self.compiler))

`

1040

1040

`.env("RUSTC", builder.rustc(self.compiler));

`

1041

1041

``

1042

``

`-

add_rustdoc_cargo_lld_flags(&mut cmd, builder, self.compiler.host, LldThreads::No);

`

``

1042

`+

add_rustdoc_cargo_linker_args(&mut cmd, builder, self.compiler.host, LldThreads::No);

`

1043

1043

``

1044

1044

`for path in &builder.paths {

`

1045

1045

`if let Some(p) = helpers::is_valid_test_suite_arg(path, "tests/rustdoc-gui", builder) {

`

`@@ -1746,14 +1746,14 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the

`

1746

1746

``

1747

1747

`let mut hostflags = flags.clone();

`

1748

1748

` hostflags.push(format!("-Lnative={}", builder.test_helpers_out(compiler.host).display()));

`

1749

``

`-

hostflags.extend(builder.lld_flags(compiler.host));

`

``

1749

`+

hostflags.extend(linker_args(builder, compiler.host, LldThreads::No));

`

1750

1750

`for flag in hostflags {

`

1751

1751

` cmd.arg("--host-rustcflags").arg(flag);

`

1752

1752

`}

`

1753

1753

``

1754

1754

`let mut targetflags = flags;

`

1755

1755

` targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));

`

1756

``

`-

targetflags.extend(builder.lld_flags(target));

`

``

1756

`+

targetflags.extend(linker_args(builder, compiler.host, LldThreads::No));

`

1757

1757

`for flag in targetflags {

`

1758

1758

` cmd.arg("--target-rustcflags").arg(flag);

`

1759

1759

`}

`