diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2019-01-06 13:55:15 +0100 |
|---|---|---|
| committer | Matthias Krüger <matthias.krueger@famsik.de> | 2019-01-07 18:57:41 +0100 |
| commit | c5101b6dffd2c917e1670ee0d94a146cc075f956 (patch) | |
| tree | 782f62abc46c50ac474eae8e1d4e03fca6349353 /src/librustc/session | |
| parent | 495fc5ee9dd00b02eb837256d98284f2f3acc61d (diff) | |
| download | rust-c5101b6dffd2c917e1670ee0d94a146cc075f956.tar.gz rust-c5101b6dffd2c917e1670ee0d94a146cc075f956.zip | |
Revert "Auto merge of #57101 - o01eg:fix-57014, r=alexcrichton"
This reverts commit 68614265d312fc2cbe8a696f7dabb9416eb6f221, reversing changes made to cae623c5ce12df8f237264d8f2c31fdaa664c382. Should fix tools on windows. Reopens #57014
Diffstat (limited to 'src/librustc/session')
| -rw-r--r-- | src/librustc/session/filesearch.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/librustc/session/filesearch.rs b/src/librustc/session/filesearch.rs index c6e68ba379e..19f1c7a18fa 100644 --- a/src/librustc/session/filesearch.rs +++ b/src/librustc/session/filesearch.rs @@ -114,13 +114,6 @@ pub fn make_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf { sysroot.join(&relative_target_lib_path(sysroot, target_triple)) } -pub fn target_lib_path(target_triple: &str) -> PathBuf { - let mut p = PathBuf::from(RUST_LIB_DIR); - p.push(target_triple); - p.push("lib"); - p -} - pub fn get_or_default_sysroot() -> PathBuf { // Follow symlinks. If the resolved path is relative, make it absolute. fn canonicalize(path: Option<PathBuf>) -> Option<PathBuf> { |