about summary refs log tree commit diff
path: root/compiler/rustc_driver
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-09-17 14:09:47 +0900
committerGitHub <noreply@github.com>2021-09-17 14:09:47 +0900
commita84d39c7d4e8b1cdbfc44f368181f2fe05a6ac1c (patch)
tree0eb0a0a375f5fcebdd5b45bca1dd2fa8c6bccbb3 /compiler/rustc_driver
parent758c7bcc58387178ee0d7c454e6cf748a44a8618 (diff)
parentd7ef0b30e89960aede88bf450e4a2172332432e0 (diff)
downloadrust-a84d39c7d4e8b1cdbfc44f368181f2fe05a6ac1c.tar.gz
rust-a84d39c7d4e8b1cdbfc44f368181f2fe05a6ac1c.zip
Rollup merge of #88751 - bjorn3:move_filesearch, r=oli-obk
Couple of changes to FileSearch and SearchPath

* Turn a couple of regular comments into doc comments
* Move `get_tools_search_paths` from `FileSearch` to `Session`
* Use Lrc instead of Option to avoid duplication of a `SearchPath`
Diffstat (limited to 'compiler/rustc_driver')
-rw-r--r--compiler/rustc_driver/src/lib.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
index 53053327d0d..4c6a2baaef1 100644
--- a/compiler/rustc_driver/src/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
@@ -677,10 +677,7 @@ impl RustcDefaultCalls {
                     println!("{}", targets.join("\n"));
                 }
                 Sysroot => println!("{}", sess.sysroot.display()),
-                TargetLibdir => println!(
-                    "{}",
-                    sess.target_tlib_path.as_ref().unwrap_or(&sess.host_tlib_path).dir.display()
-                ),
+                TargetLibdir => println!("{}", sess.target_tlib_path.dir.display()),
                 TargetSpec => println!("{}", sess.target.to_json().pretty()),
                 FileNames | CrateName => {
                     let input = input.unwrap_or_else(|| {