From 8a979525893074c1949166713d4ba10b59d85b50 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Wed, 19 Oct 2022 23:32:06 -0500 Subject: [PATCH 01/20] made changes to compile.rs to change the name --- src/bootstrap/compile.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 4ccdabe4bb67d..c9ccd27ed8548 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1106,11 +1106,11 @@ impl Step for Sysroot { let compiler = self.compiler; let host_dir = builder.out.join(&compiler.host.triple); let sysroot = if compiler.stage == 0 { - host_dir.join("stage0-sysroot") + builder.out.join(&compiler.host.triple).join("stage0-sysroot") } else if builder.download_rustc() { - host_dir.join("ci-rustc-sysroot") + builder.out.join(&compiler.host.triple).join("ci-rustc-sysroot") } else { - host_dir.join(format!("stage{}", compiler.stage)) + builder.out.join(&compiler.host.triple).join(format!("stage{}", compiler.stage)) }; let _ = fs::remove_dir_all(&sysroot); t!(fs::create_dir_all(&sysroot)); From 184b115e76e1ed8be9a79b07b35ba785cdc95d16 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 00:06:03 -0500 Subject: [PATCH 02/20] reverted changes, as earlier changes was appropriate --- src/bootstrap/compile.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index c9ccd27ed8548..4ccdabe4bb67d 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1106,11 +1106,11 @@ impl Step for Sysroot { let compiler = self.compiler; let host_dir = builder.out.join(&compiler.host.triple); let sysroot = if compiler.stage == 0 { - builder.out.join(&compiler.host.triple).join("stage0-sysroot") + host_dir.join("stage0-sysroot") } else if builder.download_rustc() { - builder.out.join(&compiler.host.triple).join("ci-rustc-sysroot") + host_dir.join("ci-rustc-sysroot") } else { - builder.out.join(&compiler.host.triple).join(format!("stage{}", compiler.stage)) + host_dir.join(format!("stage{}", compiler.stage)) }; let _ = fs::remove_dir_all(&sysroot); t!(fs::create_dir_all(&sysroot)); From b5cd01a8caa3c58e4593f5827b4bbf71ce37a095 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 00:34:03 -0500 Subject: [PATCH 03/20] made changes as per the suggestion --- src/bootstrap/compile.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 4ccdabe4bb67d..0af65619eb708 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1107,8 +1107,6 @@ impl Step for Sysroot { let host_dir = builder.out.join(&compiler.host.triple); let sysroot = if compiler.stage == 0 { host_dir.join("stage0-sysroot") - } else if builder.download_rustc() { - host_dir.join("ci-rustc-sysroot") } else { host_dir.join(format!("stage{}", compiler.stage)) }; From f3872aa72f2846e9a670f93b2ca6241e401d1850 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 09:15:50 -0500 Subject: [PATCH 04/20] renamed stage0 to bootstrap-sysroot --- src/bootstrap/bootstrap.py | 2 +- src/bootstrap/compile.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 57128685d9110..b92b975975086 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -597,7 +597,7 @@ def bin_root(self): >>> rb.bin_root() == os.path.join("build", "devel", "stage0") True """ - subdir = "stage0" + subdir = "bootstrap-sysroot" return os.path.join(self.build_dir, self.build, subdir) def get_toml(self, key, section=None): diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 0af65619eb708..b385322c96c4d 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1106,7 +1106,7 @@ impl Step for Sysroot { let compiler = self.compiler; let host_dir = builder.out.join(&compiler.host.triple); let sysroot = if compiler.stage == 0 { - host_dir.join("stage0-sysroot") + host_dir.join("bootstrap-sysroot") } else { host_dir.join(format!("stage{}", compiler.stage)) }; From 36022827ba5730c3d91e84d15d4643986377f8e2 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 09:28:59 -0500 Subject: [PATCH 05/20] empty commit to restart the build From e3b777f0875edfcf70772dc24d9327e5d2bb5768 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 12:04:10 -0500 Subject: [PATCH 06/20] renamed stage0 to bootstrap-sysroot in src/bootstrap/config.rs and added changes to CHANGELOG.md --- src/bootstrap/CHANGELOG.md | 1 + src/bootstrap/config.rs | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/CHANGELOG.md b/src/bootstrap/CHANGELOG.md index 64b74ecc9defd..41f8a78d0d402 100644 --- a/src/bootstrap/CHANGELOG.md +++ b/src/bootstrap/CHANGELOG.md @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Changes since the last major version] +- These are effectively user facing because they're used for `rustup link`. So far this has worked reasonably well, but after #101691 stage0-sysroot will become user facing as well, at which point it will become extremely confusing that there's both that and stage0. [#103286](https://github.com/rust-lang/rust/pull/103286) - Vendoring is no longer done automatically when building from git sources. To use vendoring, run `cargo vendor` manually, or use the pre-vendored `rustc-src` tarball. - `llvm-libunwind` now accepts `in-tree` (formerly true), `system` or `no` (formerly false) [#77703](https://github.com/rust-lang/rust/pull/77703) - The options `infodir`, `localstatedir`, and `gpg-password-file` are no longer allowed in config.toml. Previously, they were ignored without warning. Note that `infodir` and `localstatedir` are still accepted by `./configure`, with a warning. [#82451](https://github.com/rust-lang/rust/pull/82451) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 635823b958b18..ac998f0e0bea8 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -1248,7 +1248,7 @@ impl Config { // If using a system toolchain for bootstrapping, see if that has rustfmt available. let host = config.build; let rustfmt_path = config.initial_rustc.with_file_name(exe("rustfmt", host)); - let bin_root = config.out.join(host.triple).join("stage0"); + let bin_root = config.out.join(host.triple).join("bootstrap-sysroot"); if !rustfmt_path.starts_with(&bin_root) { // Using a system-provided toolchain; we shouldn't download rustfmt. *config.initial_rustfmt.borrow_mut() = RustfmtState::SystemToolchain(rustfmt_path); @@ -1593,14 +1593,21 @@ fn maybe_download_rustfmt(builder: &Builder<'_>) -> Option { let host = builder.config.build; let rustfmt_path = builder.config.initial_rustc.with_file_name(exe("rustfmt", host)); - let bin_root = builder.config.out.join(host.triple).join("stage0"); + let bin_root = builder.config.out.join(host.triple).join("bootstrap-sysroot"); let rustfmt_stamp = bin_root.join(".rustfmt-stamp"); if rustfmt_path.exists() && !program_out_of_date(&rustfmt_stamp, &channel) { return Some(rustfmt_path); } let filename = format!("rustfmt-{version}-{build}.tar.xz", build = host.triple); - download_component(builder, DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0"); + download_component( + builder, + DownloadSource::Dist, + filename, + "rustfmt-preview", + &date, + "bootstrap-sysroot", + ); builder.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt")); builder.fix_bin_or_dylib(&bin_root.join("bin").join("cargo-fmt")); From cbf6c2c57fe48aeed26311bcd01378e213a7d184 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 12:33:41 -0500 Subject: [PATCH 07/20] changed version number to 3 and changed CHANGELOG.md --- src/bootstrap/CHANGELOG.md | 3 ++- src/bootstrap/lib.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/CHANGELOG.md b/src/bootstrap/CHANGELOG.md index 41f8a78d0d402..af54dc26e603a 100644 --- a/src/bootstrap/CHANGELOG.md +++ b/src/bootstrap/CHANGELOG.md @@ -7,7 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Changes since the last major version] -- These are effectively user facing because they're used for `rustup link`. So far this has worked reasonably well, but after #101691 stage0-sysroot will become user facing as well, at which point it will become extremely confusing that there's both that and stage0. [#103286](https://github.com/rust-lang/rust/pull/103286) +## [Version 3] - 2022-10-20 +- The names of the sysroot directories have changed. Previously they were `stage0`, `stage0-sysroot`, `stage1`, and `stage2`. Now they are `bootstrap-sysroot`, `stage0-sysroot`, `stage1-sysroot`, and `stage2-sysroot`. If you've created a rustup toolchain using these sysroots with `rustup toolchain link mytoolchain build/stage1`, you will need to update them by running `rustup toolchain remove mytoolchain && rustup toolchain link mytoolchain build/stage1`. [#103286](https://github.com/rust-lang/rust/pull/103286) - Vendoring is no longer done automatically when building from git sources. To use vendoring, run `cargo vendor` manually, or use the pre-vendored `rustc-src` tarball. - `llvm-libunwind` now accepts `in-tree` (formerly true), `system` or `no` (formerly false) [#77703](https://github.com/rust-lang/rust/pull/77703) - The options `infodir`, `localstatedir`, and `gpg-password-file` are no longer allowed in config.toml. Previously, they were ignored without warning. Note that `infodir` and `localstatedir` are still accepted by `./configure`, with a warning. [#82451](https://github.com/rust-lang/rust/pull/82451) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 7e70e99bb8ca2..99cda86178565 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -191,7 +191,7 @@ const LLVM_TOOLS: &[&str] = &[ /// LLD file names for all flavors. const LLD_FILE_NAMES: &[&str] = &["ld.lld", "ld64.lld", "lld-link", "wasm-ld"]; -pub const VERSION: usize = 2; +pub const VERSION: usize = 3; /// Extra --check-cfg to add when building /// (Mode restriction, config name, config values (if any)) From ca9d12a36df16f509af751c473b5911307b9e636 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 12:46:15 -0500 Subject: [PATCH 08/20] updated the missing update in config.rs --- src/bootstrap/config.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index ac998f0e0bea8..c87f08ad21c8b 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -828,11 +828,13 @@ impl Config { // We still support running outside the repository if we find we aren't in a git directory. cmd.arg("rev-parse").arg("--show-toplevel"); // Discard stderr because we expect this to fail when building from a tarball. - let output = cmd - .stderr(std::process::Stdio::null()) - .output() - .ok() - .and_then(|output| if output.status.success() { Some(output) } else { None }); + let output = cmd.stderr(std::process::Stdio::null()).output().ok().and_then(|output| { + if output.status.success() { + Some(output) + } else { + None + } + }); if let Some(output) = output { let git_root = String::from_utf8(output.stdout).unwrap(); // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes. @@ -933,14 +935,12 @@ impl Config { config.out = crate::util::absolute(&config.out); } - config.initial_rustc = build - .rustc - .map(PathBuf::from) - .unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/rustc")); - config.initial_cargo = build - .cargo - .map(PathBuf::from) - .unwrap_or_else(|| config.out.join(config.build.triple).join("stage0/bin/cargo")); + config.initial_rustc = build.rustc.map(PathBuf::from).unwrap_or_else(|| { + config.out.join(config.build.triple).join("bootstrap-sysroot/bin/rustc") + }); + config.initial_cargo = build.cargo.map(PathBuf::from).unwrap_or_else(|| { + config.out.join(config.build.triple).join("bootstrap-sysroot/bin/cargo") + }); // NOTE: it's important this comes *after* we set `initial_rustc` just above. if config.dry_run { From 44401f06b361b2b60f3af1e6256c20a086bd84cd Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 13:21:31 -0500 Subject: [PATCH 09/20] reveted deletion of some lines in compile.rs --- src/bootstrap/compile.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index b385322c96c4d..b17615d9a4386 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1107,6 +1107,8 @@ impl Step for Sysroot { let host_dir = builder.out.join(&compiler.host.triple); let sysroot = if compiler.stage == 0 { host_dir.join("bootstrap-sysroot") + } else if builder.download_rustc() { + host_dir.join("ci-rustc-sysroot") } else { host_dir.join(format!("stage{}", compiler.stage)) }; From 3d26bd74fd0cce128a04eec850eb42996485845e Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 13:36:28 -0500 Subject: [PATCH 10/20] formatting --- src/bootstrap/config.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index c87f08ad21c8b..27b3191ee38fb 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -828,13 +828,11 @@ impl Config { // We still support running outside the repository if we find we aren't in a git directory. cmd.arg("rev-parse").arg("--show-toplevel"); // Discard stderr because we expect this to fail when building from a tarball. - let output = cmd.stderr(std::process::Stdio::null()).output().ok().and_then(|output| { - if output.status.success() { - Some(output) - } else { - None - } - }); + let output = cmd + .stderr(std::process::Stdio::null()) + .output() + .ok() + .and_then(|output| if output.status.success() { Some(output) } else { None }); if let Some(output) = output { let git_root = String::from_utf8(output.stdout).unwrap(); // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes. From a0ffa72cc3cb04f5adb01f502b51b84b7b684b23 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 15:19:45 -0500 Subject: [PATCH 11/20] made sysroot search as default and then the incremental stage{}-sysroot --- src/bootstrap/compile.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index b17615d9a4386..edb88bf9a30be 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1105,13 +1105,15 @@ impl Step for Sysroot { fn run(self, builder: &Builder<'_>) -> Interned { let compiler = self.compiler; let host_dir = builder.out.join(&compiler.host.triple); - let sysroot = if compiler.stage == 0 { - host_dir.join("bootstrap-sysroot") - } else if builder.download_rustc() { + let sysroot = if builder.download_rustc() { host_dir.join("ci-rustc-sysroot") } else { host_dir.join(format!("stage{}", compiler.stage)) }; + + //else { + // host_dir.join(format!("stage{}", compiler.stage)) + //}; let _ = fs::remove_dir_all(&sysroot); t!(fs::create_dir_all(&sysroot)); From 76eff2674e03c6155a532aa559b4197569e7ee4e Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 16:09:08 -0500 Subject: [PATCH 12/20] fixed breaking test related to stage0 name change --- src/bootstrap/bootstrap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index b92b975975086..6f8567a738ce8 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -588,13 +588,13 @@ def bin_root(self): >>> rb = RustBuild() >>> rb.build_dir = "build" - >>> rb.bin_root() == os.path.join("build", "stage0") + >>> rb.bin_root() == os.path.join("build", "bootstrap-sysroot") True When the 'build' property is given should be a nested directory: >>> rb.build = "devel" - >>> rb.bin_root() == os.path.join("build", "devel", "stage0") + >>> rb.bin_root() == os.path.join("build", "devel", "bootstrap-sysroot") True """ subdir = "bootstrap-sysroot" From c8ca2a5efcbfff0f0e5ec6f4ac3162a133364d8f Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 16:11:06 -0500 Subject: [PATCH 13/20] remove commented/unwanted code --- src/bootstrap/compile.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index edb88bf9a30be..3241f32d5fa42 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1111,9 +1111,6 @@ impl Step for Sysroot { host_dir.join(format!("stage{}", compiler.stage)) }; - //else { - // host_dir.join(format!("stage{}", compiler.stage)) - //}; let _ = fs::remove_dir_all(&sysroot); t!(fs::create_dir_all(&sysroot)); From bf0a9a8f152be568189ecac6feda2f5b24045344 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 16:49:05 -0500 Subject: [PATCH 14/20] fixed another instance of failing test --- src/bootstrap/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 6f8567a738ce8..4a5e11ea44b91 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -571,7 +571,7 @@ def rustc_stamp(self): >>> rb = RustBuild() >>> rb.build_dir = "build" - >>> rb.rustc_stamp() == os.path.join("build", "stage0", ".rustc-stamp") + >>> rb.rustc_stamp() == os.path.join("build", "bootstrap-sysroot", ".rustc-stamp") True """ return os.path.join(self.bin_root(), '.rustc-stamp') From 917093baacb6ffb1f48bd419b5d44252244af9e8 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Thu, 20 Oct 2022 17:32:54 -0500 Subject: [PATCH 15/20] added sysroot to the next stage builds --- src/bootstrap/compile.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 3241f32d5fa42..76300c9064190 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -1108,7 +1108,7 @@ impl Step for Sysroot { let sysroot = if builder.download_rustc() { host_dir.join("ci-rustc-sysroot") } else { - host_dir.join(format!("stage{}", compiler.stage)) + host_dir.join(format!("stage{}-sysroot", compiler.stage)) }; let _ = fs::remove_dir_all(&sysroot); From fb0eec90d7c957b1c874d4e88989d04c08d4b718 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Wed, 26 Oct 2022 11:59:06 -0500 Subject: [PATCH 16/20] changed ci script to take the namechange of sysroot directories --- src/ci/pgo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index cbe32920a7458..adb01e5ce3a6a 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -23,8 +23,8 @@ fi # The various build artifacts used in other commands: to launch rustc builds, build the perf # collector, and run benchmarks to gather profiling data BUILD_ARTIFACTS=$BUILD_ROOT/build/$PGO_HOST -RUSTC_STAGE_0=$BUILD_ARTIFACTS/stage0/bin/rustc -CARGO_STAGE_0=$BUILD_ARTIFACTS/stage0/bin/cargo +RUSTC_STAGE_0=$BUILD_ARTIFACTS/bootstrap-sysroot/bin/rustc +CARGO_STAGE_0=$BUILD_ARTIFACTS/bootstrap-sysroot/bin/cargo RUSTC_STAGE_2=$BUILD_ARTIFACTS/stage2/bin/rustc # Windows needs these to have the .exe extension From 4525f55b6f5a5084c3d0552888a11e3b93593fa0 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Wed, 26 Oct 2022 12:08:45 -0500 Subject: [PATCH 17/20] appended sysroot to the stage2 as part of sysroot name change process --- src/ci/pgo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index adb01e5ce3a6a..5d805762a62cd 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -25,7 +25,7 @@ fi BUILD_ARTIFACTS=$BUILD_ROOT/build/$PGO_HOST RUSTC_STAGE_0=$BUILD_ARTIFACTS/bootstrap-sysroot/bin/rustc CARGO_STAGE_0=$BUILD_ARTIFACTS/bootstrap-sysroot/bin/cargo -RUSTC_STAGE_2=$BUILD_ARTIFACTS/stage2/bin/rustc +RUSTC_STAGE_2=$BUILD_ARTIFACTS/stage2-sysroot/bin/rustc # Windows needs these to have the .exe extension if isWindows; then From 37548a76eebe851ae4d068aa412a6894a259f3a3 Mon Sep 17 00:00:00 2001 From: chetankokil Date: Wed, 26 Oct 2022 13:12:57 -0500 Subject: [PATCH 18/20] added the miss changed on line 229 --- src/ci/pgo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index 5d805762a62cd..232d497155e01 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -226,5 +226,5 @@ else fi echo "Rustc binary size" -ls -la ./build/$PGO_HOST/stage2/bin -ls -la ./build/$PGO_HOST/stage2/lib +ls -la ./build/$PGO_HOST/stage2-sysroot/bin +ls -la ./build/$PGO_HOST/stage2-sysroot/lib From bce70575a579c8a46978efd94d65a783027d704c Mon Sep 17 00:00:00 2001 From: Chetan Kokil Date: Mon, 31 Oct 2022 09:47:47 -0500 Subject: [PATCH 19/20] Update src/bootstrap/CHANGELOG.md Co-authored-by: Joshua Nelson --- src/bootstrap/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/CHANGELOG.md b/src/bootstrap/CHANGELOG.md index af54dc26e603a..a9f2bac6230c9 100644 --- a/src/bootstrap/CHANGELOG.md +++ b/src/bootstrap/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Changes since the last major version] ## [Version 3] - 2022-10-20 -- The names of the sysroot directories have changed. Previously they were `stage0`, `stage0-sysroot`, `stage1`, and `stage2`. Now they are `bootstrap-sysroot`, `stage0-sysroot`, `stage1-sysroot`, and `stage2-sysroot`. If you've created a rustup toolchain using these sysroots with `rustup toolchain link mytoolchain build/stage1`, you will need to update them by running `rustup toolchain remove mytoolchain && rustup toolchain link mytoolchain build/stage1`. [#103286](https://github.com/rust-lang/rust/pull/103286) +- The names of the sysroot directories have changed. Previously they were `stage0`, `stage0-sysroot`, `stage1`, and `stage2`. Now they are `bootstrap-sysroot`, `stage0-sysroot`, `stage1-sysroot`, and `stage2-sysroot`. If you've created a rustup toolchain using these sysroots with `rustup toolchain link mytoolchain build/stage1`, you will need to update them by running `rustup toolchain remove mytoolchain && rustup toolchain link mytoolchain build/stage1-sysroot`. [#103286](https://github.com/rust-lang/rust/pull/103286) - Vendoring is no longer done automatically when building from git sources. To use vendoring, run `cargo vendor` manually, or use the pre-vendored `rustc-src` tarball. - `llvm-libunwind` now accepts `in-tree` (formerly true), `system` or `no` (formerly false) [#77703](https://github.com/rust-lang/rust/pull/77703) - The options `infodir`, `localstatedir`, and `gpg-password-file` are no longer allowed in config.toml. Previously, they were ignored without warning. Note that `infodir` and `localstatedir` are still accepted by `./configure`, with a warning. [#82451](https://github.com/rust-lang/rust/pull/82451) From 445253db1ebb3378d89cf732b38af1cd35dd1ee8 Mon Sep 17 00:00:00 2001 From: Chetan Kokil Date: Sun, 20 Nov 2022 12:55:54 -0600 Subject: [PATCH 20/20] Update config.rs --- src/bootstrap/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 42400e9344a81..4f82e7422bab6 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -1647,7 +1647,7 @@ impl Config { compiler/ or library/" ); } - + } fn maybe_download_rustfmt(builder: &Builder<'_>) -> Option { let RustfmtMetadata { date, version } = builder.config.stage0_metadata.rustfmt.as_ref()?; let channel = format!("{version}-{date}");