patches/rust/void/0006-fix-rustdoc-when-cross-compiling.patch

   1 From 50075907c3dd2f06d471b3375d7c0ee850263eb2 Mon Sep 17 00:00:00 2001
   2 From: Daniel Kolesa <daniel@octaforge.org>
   3 Date: Mon, 20 Dec 2021 01:48:14 +0100
   4 Subject: [PATCH 06/15] fix rustdoc when cross-compiling
   5
   6 ---
   7  src/bootstrap/bin/rustdoc.rs | 7 ++-----
   8  1 file changed, 2 insertions(+), 5 deletions(-)
   9
  10 diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
  11 index 5f85fc5aa..01e81fc39 100644
  12 --- a/src/bootstrap/bin/rustdoc.rs
  13 +++ b/src/bootstrap/bin/rustdoc.rs
  14 @@ -26,9 +26,6 @@ fn main() {
  15          Err(_) => 0,
  16      };
  17
  18 -    let mut dylib_path = dylib_path();
  19 -    dylib_path.insert(0, PathBuf::from(libdir.clone()));
  20 -
  21      let mut cmd = Command::new(rustdoc);
  22
  23      // cfg(bootstrap)
  24 @@ -43,7 +40,7 @@ fn main() {
  25      }
  26
  27      cmd.args(&args);
  28 -    cmd.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());
  29 +    cmd.env(dylib_path_var(), PathBuf::from(libdir.clone()));
  30
  31      // Force all crates compiled by this compiler to (a) be unstable and (b)
  32      // allow the `rustc_private` feature to link to other unstable crates
  33 @@ -69,7 +66,7 @@ fn main() {
  34          eprintln!(
  35              "rustdoc command: {:?}={:?} {:?}",
  36              dylib_path_var(),
  37 -            env::join_paths(&dylib_path).unwrap(),
  38 +            PathBuf::from(libdir.clone()),
  39              cmd,
  40          );
  41          eprintln!("sysroot: {:?}", sysroot);
  42 --
  43 2.37.2
  44