Skip to content

Commit

Permalink
Rename add_lib_path to add_dylib_path
Browse files Browse the repository at this point in the history
  • Loading branch information
cuviper committed Mar 18, 2020
1 parent f509b26 commit 71f5aed
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/builder.rs
Expand Up @@ -23,7 +23,7 @@ use crate::install;
use crate::native;
use crate::test;
use crate::tool;
use crate::util::{self, add_lib_path, exe, libdir};
use crate::util::{self, add_dylib_path, exe, libdir};
use crate::{Build, DocTests, GitRepo, Mode};

pub use crate::Compiler;
Expand Down Expand Up @@ -660,7 +660,7 @@ impl<'a> Builder<'a> {
return;
}

add_lib_path(vec![self.rustc_libdir(compiler)], &mut cmd.command);
add_dylib_path(vec![self.rustc_libdir(compiler)], &mut cmd.command);
}

/// Gets a path to the compiler specified.
Expand Down
6 changes: 3 additions & 3 deletions src/bootstrap/tool.rs
Expand Up @@ -12,7 +12,7 @@ use crate::channel;
use crate::channel::GitInfo;
use crate::compile;
use crate::toolstate::ToolState;
use crate::util::{add_lib_path, exe, CiEnv};
use crate::util::{add_dylib_path, exe, CiEnv};
use crate::Compiler;
use crate::Mode;

Expand Down Expand Up @@ -388,7 +388,7 @@ pub struct ErrorIndex {
impl ErrorIndex {
pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command {
let mut cmd = Command::new(builder.ensure(ErrorIndex { compiler }));
add_lib_path(
add_dylib_path(
vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))],
&mut cmd,
);
Expand Down Expand Up @@ -689,7 +689,7 @@ impl<'a> Builder<'a> {
}
}

add_lib_path(lib_paths, &mut cmd);
add_dylib_path(lib_paths, &mut cmd);
cmd
}
}
2 changes: 1 addition & 1 deletion src/bootstrap/util.rs
Expand Up @@ -40,7 +40,7 @@ pub fn libdir(target: &str) -> &'static str {
}

/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
pub fn add_lib_path(path: Vec<PathBuf>, cmd: &mut Command) {
pub fn add_dylib_path(path: Vec<PathBuf>, cmd: &mut Command) {
let mut list = dylib_path();
for path in path {
list.insert(0, path);
Expand Down

0 comments on commit 71f5aed

Please sign in to comment.