Auto merge of #83314 - Aaron1011:print-unstable-value, r=lcnr

[rust.git] / src / bootstrap / sanity.rs

diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 08acc3d671fac8b836e20cd5bd981d7f86c915c0..ed0cbdf97b0910d716ac83c2d91a0c7ea466dd6f 100644 (file)
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -113,6 +113,13 @@ pub fn check(build: &mut Build) {
         .or_else(|| cmd_finder.maybe_have("node"))
         .or_else(|| cmd_finder.maybe_have("nodejs"));
 
+    build.config.npm = build
+        .config
+        .npm
+        .take()
+        .map(|p| cmd_finder.must_have(p))
+        .or_else(|| cmd_finder.maybe_have("npm"));
+
     build.config.gdb = build
         .config
         .gdb