improve initial target libdir finding logic

Signed-off-by: onur-ozkan <[email protected]>
rust-lang · Nov 8, 2024 · 1e322a0 · 1e322a0
1 parent 52c5d30
commit 1e322a0
Showing 1 changed file with 11 additions and 25 deletions.
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
@@ -315,33 +315,20 @@ impl Build {
         let in_tree_llvm_info = config.in_tree_llvm_info.clone();
         let in_tree_gcc_info = config.in_tree_gcc_info.clone();
 
-        let initial_target_libdir_str = if config.dry_run() {
-            "/dummy/lib/path/to/lib/".to_string()
-        } else {
-            output(
-                Command::new(&config.initial_rustc)
-                    .arg("--target")
-                    .arg(config.build.rustc_target_arg())
-                    .arg("--print")
-                    .arg("target-libdir"),
-            )
-        };
+        let initial_target_libdir_str =
+            config.initial_sysroot.join("lib/rustlib").join(config.build).join("lib");
+
         let initial_target_dir = Path::new(&initial_target_libdir_str).parent().unwrap();
         let initial_lld = initial_target_dir.join("bin").join("rust-lld");
 
-        let initial_sysroot = if config.dry_run() {
-            "/dummy".to_string()
-        } else {
-            output(Command::new(&config.initial_rustc).arg("--print").arg("sysroot"))
-        }
-        .trim()
-        .to_string();
-
         // FIXME(Zalathar): Determining this path occasionally fails locally for
         // unknown reasons, so we print some extra context to help track down why.
         let find_initial_libdir = || {
-            let initial_libdir =
-                initial_target_dir.parent()?.parent()?.strip_prefix(&initial_sysroot).ok()?;
+            let initial_libdir = initial_target_dir
+                .parent()?
+                .parent()?
+                .strip_prefix(&config.initial_sysroot)
+                .ok()?;
             Some(initial_libdir.to_path_buf())
         };
         let Some(initial_libdir) = find_initial_libdir() else {
@@ -350,7 +337,6 @@ impl Build {
 - config.initial_rustc:      {rustc:?}
 - initial_target_libdir_str: {initial_target_libdir_str:?}
 - initial_target_dir:        {initial_target_dir:?}
-- initial_sysroot:           {initial_sysroot:?}
 ",
                 rustc = config.initial_rustc,
             );
@@ -383,11 +369,11 @@ impl Build {
         }
 
         let mut build = Build {
-            initial_rustc: config.initial_rustc.clone(),
-            initial_cargo: config.initial_cargo.clone(),
             initial_lld,
             initial_libdir,
-            initial_sysroot: initial_sysroot.into(),
+            initial_rustc: config.initial_rustc.clone(),
+            initial_cargo: config.initial_cargo.clone(),
+            initial_sysroot: config.initial_sysroot.clone(),
             local_rebuild: config.local_rebuild,
             fail_fast: config.cmd.fail_fast(),
             doc_tests: config.cmd.doc_tests(),