about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-14 15:11:30 -0800
committerbors <bors@rust-lang.org>2014-01-14 15:11:30 -0800
commitdd8b011319f5cfbfb3329d9dad185be884f3a4d6 (patch)
tree131975a34c3f3204efc67bc7bb4202f5a5c210ab /src
parentfaa0b5aa618b19d365230329746a11ab17da7847 (diff)
parenta599d897fcc2c66c6ad4462d3048873bd0ed87b9 (diff)
downloadrust-dd8b011319f5cfbfb3329d9dad185be884f3a4d6.tar.gz
rust-dd8b011319f5cfbfb3329d9dad185be884f3a4d6.zip
auto merge of #11521 : dguenther/rust/hide_libdir_relative, r=alexcrichton
Renamed `LIBDIR_RELATIVE` to `CFG_LIBDIR_RELATIVE`. It's not a configurable variable, but it looks out of place without the `CFG_` prefix.

Fixes #11420
Diffstat (limited to 'src')
-rw-r--r--src/librustc/metadata/filesearch.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs
index f804338f4ff..93d8249336b 100644
--- a/src/librustc/metadata/filesearch.rs
+++ b/src/librustc/metadata/filesearch.rs
@@ -244,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!("LIBDIR_RELATIVE")).to_owned()
+    (env!("CFG_LIBDIR_RELATIVE")).to_owned()
 }
 
 // The name of rustc's own place to organize libraries.