]> git.lizzy.rs Git - rust.git/commit
Rollup merge of #104076 - ozkanonur:fix-ci-rustc-sysroot, r=jyn514
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 19 Nov 2022 14:35:20 +0000 (15:35 +0100)
committerGitHub <noreply@github.com>
Sat, 19 Nov 2022 14:35:20 +0000 (15:35 +0100)
commitd6298d3dc835baa475c06749bfcff56b59cdad9c
tree8052070e66030417a8c9f477be38633d5a1ac35b
parent747f29fbabbf7e230be442e5f5023692d816ab3a
parent654a4e81a5fcb399ca0a51100e7e6ba27169a3a8
Rollup merge of #104076 - ozkanonur:fix-ci-rustc-sysroot, r=jyn514

fix sysroot issue which appears for ci downloaded rustc

Currently when compiler is downloaded rather than compiled, sysroot is being `ci-rustc-sysroot` because of https://github.com/rust-lang/rust/blob/7eef946fc0e0eff40e588eab77b09b287accbec3/src/bootstrap/compile.rs#L1125-L1131 this.

And rustdoc is overriding the downloaded one at the end of the process.

With the condition I add, we simply check if the current compiler stage is target build stage, if so use the proper sysroot instead of `ci-rustc-sysroot`.

Resolves #103206
src/bootstrap/compile.rs