remove bootstrap/dylib_util module

Signed-off-by: onur-ozkan <[email protected]>

Author: onur-ozkan

src/bootstrap/bin/rustc.rs

@@ -15,14 +15,14 @@
 //! switching compilers for the bootstrap and for build scripts will probably
 //! never get replaced.
 
-include!("../dylib_util.rs");
-
 use std::env;
 use std::path::PathBuf;
 use std::process::{exit, Child, Command};
 use std::str::FromStr;
 use std::time::Instant;
 
+use bootstrap::util::{dylib_path, dylib_path_var};
+
 fn main() {
     let args = env::args_os().skip(1).collect::<Vec<_>>();
     let arg = |name| args.windows(2).find(|args| args[0] == name).and_then(|args| args[1].to_str());

src/bootstrap/bin/rustdoc.rs

@@ -7,7 +7,7 @@ use std::ffi::OsString;
 use std::path::PathBuf;
 use std::process::{exit, Command};
 
-include!("../dylib_util.rs");
+use bootstrap::util::{dylib_path, dylib_path_var};
 
 fn main() {
     let args = env::args_os().skip(1).collect::<Vec<_>>();

src/bootstrap/dylib_util.rs

@@ -59,6 +59,37 @@ pub fn is_dylib(name: &str) -> bool {
     name.ends_with(".dylib") || name.ends_with(".so") || name.ends_with(".dll")
 }
 
+// Various utilities for working with dylib paths.
+//
+// This file is meant to be included directly to avoid a dependency on the bootstrap library from
+// the rustc and rustdoc wrappers. This improves compilation time by reducing the linking time.
+
+/// Returns the environment variable which the dynamic library lookup path
+/// resides in for this platform.
+pub fn dylib_path_var() -> &'static str {
+    if cfg!(target_os = "windows") {
+        "PATH"
+    } else if cfg!(target_os = "macos") {
+        "DYLD_LIBRARY_PATH"
+    } else if cfg!(target_os = "haiku") {
+        "LIBRARY_PATH"
+    } else if cfg!(target_os = "aix") {
+        "LIBPATH"
+    } else {
+        "LD_LIBRARY_PATH"
+    }
+}
+
+/// Parses the `dylib_path_var()` environment variable, returning a list of
+/// paths that are members of this lookup path.
+pub fn dylib_path() -> Vec<PathBuf> {
+    let var = match env::var_os(dylib_path_var()) {
+        Some(v) => v,
+        None => return vec![],
+    };
+    env::split_paths(&var).collect()
+}
+
 /// Returns `true` if the file name given looks like a debug info file
 pub fn is_debug_info(name: &str) -> bool {
     // FIXME: consider split debug info on other platforms (e.g., Linux, macOS)
@@ -81,8 +112,6 @@ pub fn add_dylib_path(path: Vec<PathBuf>, cmd: &mut Command) {
     cmd.env(dylib_path_var(), t!(env::join_paths(list)));
 }
 
-include!("dylib_util.rs");
-
 /// Adds a list of lookup paths to `cmd`'s link library lookup path.
 pub fn add_link_lib_path(path: Vec<PathBuf>, cmd: &mut Command) {
     let mut list = link_lib_path();