diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index b41d60d51a8b5..e93ff00f18d1a 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -326,7 +326,7 @@ impl SplitDebuginfo {
         } else if target.contains("windows") {
             SplitDebuginfo::Packed
         } else {
-            SplitDebuginfo::Off
+            SplitDebuginfo::Unpacked
         }
     }
 }
@@ -887,11 +887,13 @@ impl Config {
         // We still support running outside the repository if we find we aren't in a git directory.
         cmd.arg("rev-parse").arg("--show-toplevel");
         // Discard stderr because we expect this to fail when building from a tarball.
-        let output = cmd
-            .stderr(std::process::Stdio::null())
-            .output()
-            .ok()
-            .and_then(|output| if output.status.success() { Some(output) } else { None });
+        let output = cmd.stderr(std::process::Stdio::null()).output().ok().and_then(|output| {
+            if output.status.success() {
+                Some(output)
+            } else {
+                None
+            }
+        });
         if let Some(output) = output {
             let git_root = String::from_utf8(output.stdout).unwrap();
             // We need to canonicalize this path to make sure it uses backslashes instead of forward slashes.