mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #108866 - Kohei316:master, r=ozkanonur

Browse Source 
Force to use the stage 2 compiler  when config.download_rustc is set

Fixes #108768
This commit is contained in:
Matthias Krüger 2023-03-07 19:57:46 +01:00 committed by GitHub
commit b0ec35362f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/builder.rs
View File

@ -910,14 +910,16 @@ pub fn compiler(&self, stage: u32, host: TargetSelection) -> Compiler {
/// new artifacts, it can't be used to rely on the presence of a particular
/// sysroot.
///
/// See `force_use_stage1` for documentation on what each argument is.
/// See `force_use_stage1` and `force_use_stage2` for documentation on what each argument is.
pub fn compiler_for(
&self,
stage: u32,
host: TargetSelection,
target: TargetSelection,
) -> Compiler {
if self.build.force_use_stage1(Compiler { stage, host }, target) {
if self.build.force_use_stage2() {
self.compiler(2, self.config.build)
} else if self.build.force_use_stage1(Compiler { stage, host }, target) {
self.compiler(1, self.config.build)
} else {
self.compiler(stage, host)

9
src/bootstrap/lib.rs
View File

@ -1209,6 +1209,15 @@ fn force_use_stage1(&self, compiler: Compiler, target: TargetSelection) -> bool
&& (self.hosts.iter().any(|h| *h == target) || target == self.build)
}
/// Checks whether the `compiler` compiling for `target` should be forced to
/// use a stage2 compiler instead.
///
/// When we download the pre-compiled version of rustc it should be forced to
/// use a stage2 compiler.
fn force_use_stage2(&self) -> bool {
self.config.download_rustc()
}
/// Given `num` in the form "a.b.c" return a "release string" which
/// describes the release version number.
///