Skip to content

Commit 3104e57

Browse files
rmehri01rmehri01
committed
use builder.config.host_target as host
1 parent 73ce6c1 commit 3104e57

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎src/bootstrap/src/core/build_steps/doc.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,7 @@ impl Step for UnstableBookGen {
11961196
let target = self.target;
11971197

11981198
let stage = builder.top_stage;
1199-
let compiler = builder.compiler(stage, self.target);
1199+
let compiler = builder.compiler(stage, builder.config.host_target);
12001200
let rustc_path =
12011201
builder.out.join(compiler.host).join(format!("stage{stage}")).join("bin").join("rustc");
12021202

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

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,19 +1021,19 @@ mod snapshot {
10211021
ctx
10221022
.config("dist")
10231023
.render_steps(), @r"
1024-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1025-
[build] rustc 0 <host> -> Rustbook 1 <host>
1026-
[doc] unstable-book (book) <host>
10271024
[build] llvm <host>
10281025
[build] rustc 0 <host> -> rustc 1 <host>
10291026
[build] rustc 1 <host> -> std 1 <host>
1027+
[build] rustc 1 <host> -> rustc 2 <host>
1028+
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1029+
[build] rustc 0 <host> -> Rustbook 1 <host>
1030+
[doc] unstable-book (book) <host>
10301031
[doc] book (book) <host>
10311032
[doc] book/first-edition (book) <host>
10321033
[doc] book/second-edition (book) <host>
10331034
[doc] book/2018-edition (book) <host>
10341035
[build] rustdoc 1 <host>
10351036
[doc] rustc 1 <host> -> standalone 2 <host>
1036-
[build] rustc 1 <host> -> rustc 2 <host>
10371037
[build] rustdoc 2 <host>
10381038
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
10391039
[build] rustc 1 <host> -> error-index 2 <host>
@@ -1076,25 +1076,25 @@ mod snapshot {
10761076
"rust.lld=true",
10771077
])
10781078
.render_steps(), @r"
1079-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1080-
[build] rustc 0 <host> -> Rustbook 1 <host>
1081-
[doc] unstable-book (book) <host>
10821079
[build] llvm <host>
10831080
[build] rustc 0 <host> -> rustc 1 <host>
10841081
[build] rustc 0 <host> -> LldWrapper 1 <host>
10851082
[build] rustc 0 <host> -> WasmComponentLd 1 <host>
10861083
[build] rustc 0 <host> -> LlvmBitcodeLinker 1 <host>
10871084
[build] rustc 1 <host> -> std 1 <host>
1085+
[build] rustc 1 <host> -> rustc 2 <host>
1086+
[build] rustc 1 <host> -> LldWrapper 2 <host>
1087+
[build] rustc 1 <host> -> WasmComponentLd 2 <host>
1088+
[build] rustc 1 <host> -> LlvmBitcodeLinker 2 <host>
1089+
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1090+
[build] rustc 0 <host> -> Rustbook 1 <host>
1091+
[doc] unstable-book (book) <host>
10881092
[doc] book (book) <host>
10891093
[doc] book/first-edition (book) <host>
10901094
[doc] book/second-edition (book) <host>
10911095
[doc] book/2018-edition (book) <host>
10921096
[build] rustdoc 1 <host>
10931097
[doc] rustc 1 <host> -> standalone 2 <host>
1094-
[build] rustc 1 <host> -> rustc 2 <host>
1095-
[build] rustc 1 <host> -> LldWrapper 2 <host>
1096-
[build] rustc 1 <host> -> WasmComponentLd 2 <host>
1097-
[build] rustc 1 <host> -> LlvmBitcodeLinker 2 <host>
10981098
[build] rustdoc 2 <host>
10991099
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
11001100
[build] rustc 1 <host> -> error-index 2 <host>
@@ -1140,13 +1140,14 @@ mod snapshot {
11401140
.hosts(&[&host_target()])
11411141
.targets(&[&host_target(), TEST_TRIPLE_1])
11421142
.render_steps(), @r"
1143+
[build] llvm <host>
1144+
[build] rustc 0 <host> -> rustc 1 <host>
1145+
[build] rustc 1 <host> -> std 1 <host>
1146+
[build] rustc 1 <host> -> rustc 2 <host>
11431147
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
11441148
[build] rustc 0 <host> -> Rustbook 1 <host>
11451149
[doc] unstable-book (book) <host>
11461150
[doc] unstable-book (book) <target1>
1147-
[build] llvm <host>
1148-
[build] rustc 0 <host> -> rustc 1 <host>
1149-
[build] rustc 1 <host> -> std 1 <host>
11501151
[doc] book (book) <host>
11511152
[doc] book/first-edition (book) <host>
11521153
[doc] book/second-edition (book) <host>
@@ -1159,7 +1160,6 @@ mod snapshot {
11591160
[doc] book/2018-edition (book) <target1>
11601161
[doc] rustc 1 <host> -> standalone 2 <host>
11611162
[doc] rustc 1 <host> -> standalone 2 <target1>
1162-
[build] rustc 1 <host> -> rustc 2 <host>
11631163
[build] rustdoc 2 <host>
11641164
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
11651165
[doc] rustc 2 <host> -> std 2 <target1> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
@@ -1213,19 +1213,19 @@ mod snapshot {
12131213
.hosts(&[&host_target(), TEST_TRIPLE_1])
12141214
.targets(&[&host_target()])
12151215
.render_steps(), @r"
1216-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1217-
[build] rustc 0 <host> -> Rustbook 1 <host>
1218-
[doc] unstable-book (book) <host>
12191216
[build] llvm <host>
12201217
[build] rustc 0 <host> -> rustc 1 <host>
12211218
[build] rustc 1 <host> -> std 1 <host>
1219+
[build] rustc 1 <host> -> rustc 2 <host>
1220+
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1221+
[build] rustc 0 <host> -> Rustbook 1 <host>
1222+
[doc] unstable-book (book) <host>
12221223
[doc] book (book) <host>
12231224
[doc] book/first-edition (book) <host>
12241225
[doc] book/second-edition (book) <host>
12251226
[doc] book/2018-edition (book) <host>
12261227
[build] rustdoc 1 <host>
12271228
[doc] rustc 1 <host> -> standalone 2 <host>
1228-
[build] rustc 1 <host> -> rustc 2 <host>
12291229
[build] rustdoc 2 <host>
12301230
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
12311231
[build] rustc 1 <host> -> error-index 2 <host>
@@ -1271,13 +1271,14 @@ mod snapshot {
12711271
.hosts(&[&host_target(), TEST_TRIPLE_1])
12721272
.targets(&[&host_target(), TEST_TRIPLE_1])
12731273
.render_steps(), @r"
1274+
[build] llvm <host>
1275+
[build] rustc 0 <host> -> rustc 1 <host>
1276+
[build] rustc 1 <host> -> std 1 <host>
1277+
[build] rustc 1 <host> -> rustc 2 <host>
12741278
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
12751279
[build] rustc 0 <host> -> Rustbook 1 <host>
12761280
[doc] unstable-book (book) <host>
12771281
[doc] unstable-book (book) <target1>
1278-
[build] llvm <host>
1279-
[build] rustc 0 <host> -> rustc 1 <host>
1280-
[build] rustc 1 <host> -> std 1 <host>
12811282
[doc] book (book) <host>
12821283
[doc] book/first-edition (book) <host>
12831284
[doc] book/second-edition (book) <host>
@@ -1290,7 +1291,6 @@ mod snapshot {
12901291
[doc] book/2018-edition (book) <target1>
12911292
[doc] rustc 1 <host> -> standalone 2 <host>
12921293
[doc] rustc 1 <host> -> standalone 2 <target1>
1293-
[build] rustc 1 <host> -> rustc 2 <host>
12941294
[build] rustdoc 2 <host>
12951295
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
12961296
[doc] rustc 2 <host> -> std 2 <target1> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
@@ -1350,20 +1350,20 @@ mod snapshot {
13501350
.hosts(&[])
13511351
.targets(&[TEST_TRIPLE_1])
13521352
.render_steps(), @r"
1353+
[build] llvm <host>
1354+
[build] rustc 0 <host> -> rustc 1 <host>
1355+
[build] rustc 1 <host> -> std 1 <host>
1356+
[build] rustc 1 <host> -> rustc 2 <host>
13531357
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
13541358
[build] rustc 0 <host> -> Rustbook 1 <host>
13551359
[doc] unstable-book (book) <target1>
1356-
[build] llvm <host>
1357-
[build] rustc 0 <host> -> rustc 1 <host>
13581360
[build] rustc 1 <host> -> std 1 <target1>
13591361
[doc] book (book) <target1>
13601362
[doc] book/first-edition (book) <target1>
13611363
[doc] book/second-edition (book) <target1>
13621364
[doc] book/2018-edition (book) <target1>
13631365
[build] rustdoc 1 <host>
1364-
[build] rustc 1 <host> -> std 1 <host>
13651366
[doc] rustc 1 <host> -> standalone 2 <target1>
1366-
[build] rustc 1 <host> -> rustc 2 <host>
13671367
[build] rustdoc 2 <host>
13681368
[doc] rustc 2 <host> -> std 2 <target1> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
13691369
[doc] nomicon (book) <target1>
@@ -1397,22 +1397,22 @@ mod snapshot {
13971397
.targets(&[TEST_TRIPLE_1])
13981398
.args(&["--set", "rust.channel=nightly", "--set", "build.extended=true"])
13991399
.render_steps(), @r"
1400-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1401-
[build] rustc 0 <host> -> Rustbook 1 <host>
1402-
[doc] unstable-book (book) <target1>
14031400
[build] llvm <host>
14041401
[build] rustc 0 <host> -> rustc 1 <host>
14051402
[build] rustc 0 <host> -> WasmComponentLd 1 <host>
1403+
[build] rustc 1 <host> -> std 1 <host>
1404+
[build] rustc 1 <host> -> rustc 2 <host>
1405+
[build] rustc 1 <host> -> WasmComponentLd 2 <host>
1406+
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1407+
[build] rustc 0 <host> -> Rustbook 1 <host>
1408+
[doc] unstable-book (book) <target1>
14061409
[build] rustc 1 <host> -> std 1 <target1>
14071410
[doc] book (book) <target1>
14081411
[doc] book/first-edition (book) <target1>
14091412
[doc] book/second-edition (book) <target1>
14101413
[doc] book/2018-edition (book) <target1>
14111414
[build] rustdoc 1 <host>
1412-
[build] rustc 1 <host> -> std 1 <host>
14131415
[doc] rustc 1 <host> -> standalone 2 <target1>
1414-
[build] rustc 1 <host> -> rustc 2 <host>
1415-
[build] rustc 1 <host> -> WasmComponentLd 2 <host>
14161416
[build] rustdoc 2 <host>
14171417
[doc] rustc 2 <host> -> std 2 <target1> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
14181418
[build] llvm <target1>
@@ -1465,21 +1465,21 @@ mod snapshot {
14651465
.config("dist")
14661466
.args(&["--set", "rust.codegen-backends=['llvm', 'cranelift']"])
14671467
.render_steps(), @r"
1468-
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1469-
[build] rustc 0 <host> -> Rustbook 1 <host>
1470-
[doc] unstable-book (book) <host>
14711468
[build] llvm <host>
14721469
[build] rustc 0 <host> -> rustc 1 <host>
14731470
[build] rustc 0 <host> -> rustc_codegen_cranelift 1 <host>
14741471
[build] rustc 1 <host> -> std 1 <host>
1472+
[build] rustc 1 <host> -> rustc 2 <host>
1473+
[build] rustc 1 <host> -> rustc_codegen_cranelift 2 <host>
1474+
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
1475+
[build] rustc 0 <host> -> Rustbook 1 <host>
1476+
[doc] unstable-book (book) <host>
14751477
[doc] book (book) <host>
14761478
[doc] book/first-edition (book) <host>
14771479
[doc] book/second-edition (book) <host>
14781480
[doc] book/2018-edition (book) <host>
14791481
[build] rustdoc 1 <host>
14801482
[doc] rustc 1 <host> -> standalone 2 <host>
1481-
[build] rustc 1 <host> -> rustc 2 <host>
1482-
[build] rustc 1 <host> -> rustc_codegen_cranelift 2 <host>
14831483
[build] rustdoc 2 <host>
14841484
[doc] rustc 2 <host> -> std 2 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
14851485
[build] rustc 1 <host> -> error-index 2 <host>
@@ -1875,6 +1875,8 @@ mod snapshot {
18751875
insta::assert_snapshot!(
18761876
ctx.config("doc")
18771877
.render_steps(), @r"
1878+
[build] llvm <host>
1879+
[build] rustc 0 <host> -> rustc 1 <host>
18781880
[build] rustc 0 <host> -> UnstableBookGen 1 <host>
18791881
[build] rustc 0 <host> -> Rustbook 1 <host>
18801882
[doc] unstable-book (book) <host>
@@ -1884,8 +1886,6 @@ mod snapshot {
18841886
[doc] book/2018-edition (book) <host>
18851887
[build] rustdoc 0 <host>
18861888
[doc] rustc 0 <host> -> standalone 1 <host>
1887-
[build] llvm <host>
1888-
[build] rustc 0 <host> -> rustc 1 <host>
18891889
[build] rustdoc 1 <host>
18901890
[doc] rustc 1 <host> -> std 1 <host> crates=[alloc,compiler_builtins,core,panic_abort,panic_unwind,proc_macro,rustc-std-workspace-core,std,std_detect,sysroot,test,unwind]
18911891
[build] rustc 0 <host> -> error-index 1 <host>

0 commit comments

Comments
 (0)