Auto merge of #116278 - Kobzol:bootstrap-lld-mode, r=albertlarsan68,p… · rust-lang/rust@befd1eb (original) (raw)

`@@ -29,8 +29,9 @@ 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, linker_flags, output, t, target_supports_cranelift_backend, up_to_date,

`

``

34

`+

LldThreads,

`

34

35

`};

`

35

36

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

`

36

37

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

`

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

`

277

278

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

`

278

279

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

`

279

280

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

`

280

``

`-

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

`

``

281

`+

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

`

281

282

` builder.run_delaying_failure(cmd);

`

282

283

`}

`

283

284

`}

`

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

`

863

864

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

`

864

865

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

`

865

866

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

`

866

``

`-

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

`

``

867

`+

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

`

867

868

``

868

869

` builder.run_delaying_failure(&mut cmd);

`

869

870

`}

`

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

`

1039

1040

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

`

1040

1041

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

`

1041

1042

``

1042

``

`-

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

`

``

1043

`+

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

`

1043

1044

``

1044

1045

`for path in &builder.paths {

`

1045

1046

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

`

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

`

1746

1747

``

1747

1748

`let mut hostflags = flags.clone();

`

1748

1749

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

`

1749

``

`-

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

`

``

1750

`+

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

`

1750

1751

`for flag in hostflags {

`

1751

1752

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

`

1752

1753

`}

`

1753

1754

``

1754

1755

`let mut targetflags = flags;

`

1755

1756

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

`

1756

``

`-

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

`

``

1757

`+

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

`

1757

1758

`for flag in targetflags {

`

1758

1759

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

`

1759

1760

`}

`

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

`

1931

1932

`//

`

1932

1933

`` // Note that if we encounter PATH we make sure to append to our own PATH

``

1933

1934

`// rather than stomp over it.

`

1934

``

`-

if !builder.config.dry_run() && target.contains("msvc") {

`

``

1935

`+

if !builder.config.dry_run() && target.is_msvc() {

`

1935

1936

`for &(ref k, ref v) in builder.cc.borrow()[&target].env() {

`

1936

1937

`if k != "PATH" {

`

1937

1938

` cmd.env(k, v);

`

`@@ -3070,7 +3071,7 @@ impl Step for TestHelpers {

`

3070

3071

`// We may have found various cross-compilers a little differently due to our

`

3071

3072

`// extra configuration, so inform cc of these compilers. Note, though, that

`

3072

3073

`// on MSVC we still need cc's detection of env vars (ugh).

`

3073

``

`-

if !target.contains("msvc") {

`

``

3074

`+

if !target.is_msvc() {

`

3074

3075

`if let Some(ar) = builder.ar(target) {

`

3075

3076

` cfg.archiver(ar);

`

3076

3077

`}

`