user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #11045 : jhasse/rust/patch-libdir, r=alexcrichton

Browse source 
See https://github.com/mozilla/rust/issues/5223#issuecomment-30455086
This commit is contained in:
bors 2014-01-07 12:26:32 -08:00
commit 4329fc6730
7 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc/metadata/filesearch.rs
View file

@ -154,12 +154,11 @@ pub fn search(filesearch: @FileSearch, pick: pick) {
}
pub fn relative_target_lib_path(target_triple: &str) -> Path {
let dir = libdir();
let mut p = Path::new(dir.as_slice());
let mut p = Path::new(libdir());
assert!(p.is_relative());
p.push(rustlibdir());
p.push(target_triple);
p.push(dir);
p.push("lib");
p
}
@ -245,7 +244,7 @@ pub fn rust_path() -> ~[Path] {
// The name of the directory rustc expects libraries to be located.
// On Unix should be "lib", on windows "bin"
pub fn libdir() -> ~str {
(env!("CFG_LIBDIR")).to_owned()
(env!("LIBDIR_RELATIVE")).to_owned()
}
// The name of rustc's own place to organize libraries.