Test fixes and rebase conflicts

Author: alexcrichton

src/bootstrap/bootstrap.py

@@ -296,7 +296,7 @@ def get_toml(self, key):
 
     def get_mk(self, key):
         for line in iter(self.config_mk.splitlines()):
-            if line.startswith(key + ' :='):
+            if line.startswith(key + ' '):
                 var = line[line.find(':=') + 2:].strip()
                 if var != '':
                     return var

src/bootstrap/doc.rs

@@ -279,7 +279,10 @@ fn symlink_dir_force(src: &Path, dst: &Path) -> io::Result<()> {
         if m.file_type().is_dir() {
             try!(fs::remove_dir_all(dst));
         } else {
-            try!(fs::remove_file(dst));
+            // handle directory junctions on windows
+            try!(fs::remove_file(dst).or_else(|_| {
+                fs::remove_dir(dst)
+            }));
         }
     }
 

src/bootstrap/native.rs

@@ -58,7 +58,7 @@ pub fn llvm(build: &Build, target: &str) {
         }
     }
     if build.config.llvm_clean_rebuild {
-        t!(fs::remove_dir_all(&out_dir));
+        drop(fs::remove_dir_all(&out_dir));
     }
 
     println!("Building LLVM for {}", target);

src/ci/docker/run.sh

@@ -58,6 +58,7 @@ exec docker \
   --env DEPLOY_ALT=$DEPLOY_ALT \
   --env LOCAL_USER_ID=`id -u` \
   --volume "$HOME/.cargo:/cargo" \
+  --privileged \
   --rm \
   rust-ci \
   /checkout/src/ci/run.sh