Skip to content

Commit 4e53043

Browse files
committed
populate the target_config now before its usage and update the test accordingly
1 parent e466296 commit 4e53043

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/bootstrap/src/core/builder/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,6 +1638,7 @@ mod snapshot {
16381638
.render_steps(), @r"
16391639
[build] llvm <host>
16401640
[build] rustc 0 <host> -> rustc 1 <host>
1641+
[build] rustc 0 <host> -> LldWrapper 1 <host>
16411642
[build] rustdoc 0 <host>
16421643
[doc] std 1 <host> crates=[core]
16431644
");
@@ -1653,6 +1654,7 @@ mod snapshot {
16531654
.render_steps(), @r"
16541655
[build] llvm <host>
16551656
[build] rustc 0 <host> -> rustc 1 <host>
1657+
[build] rustc 0 <host> -> LldWrapper 1 <host>
16561658
[build] rustdoc 0 <host>
16571659
[doc] std 1 <host> crates=[alloc,core]
16581660
");

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@ impl Config {
942942
config.rust_profile_use = flags_rust_profile_use;
943943
config.rust_profile_generate = flags_rust_profile_generate;
944944

945+
config.apply_target_config(toml.target);
945946
config.apply_rust_config(toml.rust, flags_warnings);
946947

947948
config.reproducible_artifacts = flags_reproducible_artifact;
@@ -967,8 +968,6 @@ impl Config {
967968

968969
config.apply_gcc_config(toml.gcc);
969970

970-
config.apply_target_config(toml.target);
971-
972971
match ccache {
973972
Some(StringOrBool::String(ref s)) => config.ccache = Some(s.to_string()),
974973
Some(StringOrBool::Bool(true)) => {

0 commit comments

Comments
 (0)