Fix a few errors introduced during rebase.

2017-07-12 09:15:00 -06:00
parent c7435b52a9
commit a5ab2ceef8
4 changed files with 121 additions and 62 deletions
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -192,8 +192,9 @@ impl<'a> Builder<'a> {
        impl<'a> Step<'a> for Libdir<'a> {
            type Output = PathBuf;
            fn run(self, builder: &Builder) -> PathBuf {
+                let compiler = self.compiler;
                let lib = if compiler.stage >= 2 && builder.build.config.libdir_relative.is_some() {
-                    builder.build.config.libdir_relative.cloned().unwrap()
+                    builder.build.config.libdir_relative.clone().unwrap()
                } else {
                    PathBuf::from("lib")
                };