File tree 3 files changed +627
-620
lines changed
3 files changed +627
-620
lines changed Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change @@ -337,13 +337,14 @@ pub enum Mode {
337
337
/// Compile a tool which uses all libraries we compile (up to rustc).
338
338
/// Doesn't use the stage0 compiler libraries like "other", and includes
339
339
/// tools like rustdoc, cargo, rls, etc.
340
+ ToolStd ,
340
341
ToolRustc ,
341
342
}
342
343
343
344
impl Mode {
344
345
pub fn is_tool ( & self ) -> bool {
345
346
match self {
346
- Mode :: ToolBootstrap | Mode :: ToolRustc => true ,
347
+ Mode :: ToolBootstrap | Mode :: ToolRustc | Mode :: ToolStd => true ,
347
348
_ => false
348
349
}
349
350
}
@@ -554,6 +555,7 @@ impl Build {
554
555
Mode :: Codegen => "-rustc" ,
555
556
Mode :: Rustc => "-rustc" ,
556
557
Mode :: ToolBootstrap => "-bootstrap-tools" ,
558
+ Mode :: ToolStd => "-tools" ,
557
559
Mode :: ToolRustc => "-tools" ,
558
560
} ;
559
561
self . out . join ( & * compiler. host )
Original file line number Diff line number Diff line change @@ -107,6 +107,9 @@ impl Step for ToolBuild {
107
107
Mode :: ToolRustc => {
108
108
builder. ensure ( compile:: Rustc { compiler, target } )
109
109
}
110
+ Mode :: ToolStd => {
111
+ builder. ensure ( compile:: Std { compiler, target } )
112
+ }
110
113
Mode :: ToolBootstrap => { } // uses downloaded stage0 compiler libs
111
114
_ => panic ! ( "unexpected Mode for tool build" )
112
115
}
@@ -380,7 +383,7 @@ impl Step for RemoteTestServer {
380
383
compiler : self . compiler ,
381
384
target : self . target ,
382
385
tool : "remote-test-server" ,
383
- mode : Mode :: ToolBootstrap ,
386
+ mode : Mode :: ToolStd ,
384
387
path : "src/tools/remote-test-server" ,
385
388
is_ext_tool : false ,
386
389
extra_features : Vec :: new ( ) ,
You can’t perform that action at this time.
0 commit comments