Skip to content

Commit

Permalink
Rename get_self_contained_lib_path
Browse files Browse the repository at this point in the history
  • Loading branch information
mati865 committed Jun 25, 2020
1 parent 2e3f517 commit 54293c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/librustc_codegen_ssa/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
}
// Special directory with objects used only in self-contained linkage mode
if self_contained {
let file_path = fs.get_selfcontained_lib_path().join(name);
let file_path = fs.get_self_contained_lib_path().join(name);
if file_path.exists() {
return file_path;
}
Expand Down Expand Up @@ -1500,7 +1500,7 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:

// Special directory with libraries used only in self-contained linkage mode
if self_contained {
let lib_path = sess.target_filesearch(PathKind::All).get_selfcontained_lib_path();
let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_session/filesearch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<'a> FileSearch<'a> {
make_target_lib_path(self.sysroot, self.triple)
}

pub fn get_selfcontained_lib_path(&self) -> PathBuf {
pub fn get_self_contained_lib_path(&self) -> PathBuf {
self.get_lib_path().join("self-contained")
}

Expand Down

0 comments on commit 54293c1

Please sign in to comment.