diff --git a/src/lib.rs b/src/lib.rs
index 5be21ee3f..a555a6469 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2380,6 +2380,7 @@ impl Build {
         enum ArchSpec {
             Device(&'static str),
             Simulator(&'static str),
+            #[allow(dead_code)]
             Catalyst(&'static str),
         }
 
@@ -2761,7 +2762,11 @@ impl Build {
         // interpretation at all, just pass it on through. This'll hopefully get
         // us to support spaces-in-paths.
         if Path::new(&*tool).exists() {
-            return Some((PathBuf::from(&*tool), None, Vec::new()));
+            return Some((
+                PathBuf::from(&*tool),
+                Self::rustc_wrapper_fallback(),
+                Vec::new(),
+            ));
         }
 
         // Ok now we want to handle a couple of scenarios. We'll assume from