Unify sysroot_target_{bin,lib}dir handling

Author: jieyouxu

src/bootstrap/src/core/builder/mod.rs

@@ -1161,14 +1161,7 @@ impl<'a> Builder<'a> {
         self.ensure(compile::Sysroot::new(compiler))
     }
 
-    /// Returns the bindir for a compiler's sysroot.
-    pub fn sysroot_target_bindir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
-        self.sysroot_target_libdir(compiler, target).parent().unwrap().join("bin")
-    }
-
-    /// Returns the libdir where the standard library and other artifacts are
-    /// found for a compiler's sysroot.
-    pub fn sysroot_target_libdir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
+    fn ensure_sysroot_target_dir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
         #[derive(Debug, Clone, Hash, PartialEq, Eq)]
         struct Libdir {
             compiler: Compiler,
@@ -1183,25 +1176,26 @@ impl<'a> Builder<'a> {
 
             fn run(self, builder: &Builder<'_>) -> PathBuf {
                 let lib = builder.sysroot_libdir_relative(self.compiler);
-                let sysroot = builder
-                    .sysroot(self.compiler)
-                    .join(lib)
-                    .join("rustlib")
-                    .join(self.target)
-                    .join("lib");
-                // Avoid deleting the rustlib/ directory we just copied
-                // (in `impl Step for Sysroot`).
+                let sysroot = builder.sysroot(self.compiler).join(lib).join("rustlib");
+
+                // Avoid deleting the `rustlib/` directory we just copied (in `impl Step for
+                // Sysroot`).
                 if !builder.download_rustc() {
+                    let sysroot_target_libdir = sysroot.join(self.target).join("lib");
                     builder.verbose(|| {
-                        println!("Removing sysroot {} to avoid caching bugs", sysroot.display())
+                        println!(
+                            "Removing sysroot {} to avoid caching bugs",
+                            sysroot_target_libdir.display()
+                        )
                     });
-                    let _ = fs::remove_dir_all(&sysroot);
-                    t!(fs::create_dir_all(&sysroot));
+                    let _ = fs::remove_dir_all(&sysroot_target_libdir);
+                    t!(fs::create_dir_all(&sysroot_target_libdir));
                 }
 
                 if self.compiler.stage == 0 {
-                    // The stage 0 compiler for the build triple is always pre-built.
-                    // Ensure that `libLLVM.so` ends up in the target libdir, so that ui-fulldeps tests can use it when run.
+                    // The stage 0 compiler for the build triple is always pre-built. Ensure that
+                    // `libLLVM.so` ends up in the target libdir, so that ui-fulldeps tests can use
+                    // it when run.
                     dist::maybe_install_llvm_target(
                         builder,
                         self.compiler.host,
@@ -1212,9 +1206,21 @@ impl<'a> Builder<'a> {
                 sysroot
             }
         }
+
         self.ensure(Libdir { compiler, target })
     }
 
+    /// Returns the bindir for a compiler's sysroot.
+    pub fn sysroot_target_bindir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
+        self.ensure_sysroot_target_dir(compiler, target).join(target).join("bin")
+    }
+
+    /// Returns the libdir where the standard library and other artifacts are
+    /// found for a compiler's sysroot.
+    pub fn sysroot_target_libdir(&self, compiler: Compiler, target: TargetSelection) -> PathBuf {
+        self.ensure_sysroot_target_dir(compiler, target).join(target).join("lib")
+    }
+
     pub fn sysroot_codegen_backends(&self, compiler: Compiler) -> PathBuf {
         self.sysroot_target_libdir(compiler, compiler.host).with_file_name("codegen-backends")
     }