rollup merge of #21830: japaric/for-cleanup

[rust.git] / src / librustc / plugin / load.rs

diff --git a/src/librustc/plugin/load.rs b/src/librustc/plugin/load.rs
index b9bf577b38e62fc479259241cdd1a353ed37b2c6..dd0b0a63ced9de64a3b63eddf14ace3d25b26bc6 100644 (file)
--- a/src/librustc/plugin/load.rs
+++ b/src/librustc/plugin/load.rs
@@ -15,7 +15,7 @@
 use plugin::registry::Registry;
 
 use std::mem;
-use std::os;
+use std::env;
 use std::dynamic_lib::DynamicLibrary;
 use std::collections::HashSet;
 use syntax::ast;
@@ -233,7 +233,7 @@ fn dylink_registrar<'b>(&mut self,
                         path: Path,
                         symbol: String) -> PluginRegistrarFun {
         // Make sure the path contains a / or the linker will search for it.
-        let path = os::make_absolute(&path).unwrap();
+        let path = env::current_dir().unwrap().join(&path);
 
         let lib = match DynamicLibrary::open(Some(&path)) {
             Ok(lib) => lib,