From 071a6e39b2d4c8e398acbfdf542e2bb5260b4e38 Mon Sep 17 00:00:00 2001
From: Justin Karneges <jkarneges@fastly.com>
Date: Tue, 21 Nov 2023 16:31:37 -0800
Subject: [PATCH] assume make exists in the PATH, rather than using the path
 found by qconf

---
 build.rs     | 12 ++----------
 configure    |  2 --
 qcm/conf.qcm |  2 --
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/build.rs b/build.rs
index 9062eb8d7..4b612d54f 100644
--- a/build.rs
+++ b/build.rs
@@ -124,14 +124,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         let f = fs::File::open("conf.pri")?;
         let reader = BufReader::new(f);
 
-        const CONF_VARS: &[&str] = &[
-            "BINDIR",
-            "CONFIGDIR",
-            "LIBDIR",
-            "LOGDIR",
-            "RUNDIR",
-            "MAKETOOL",
-        ];
+        const CONF_VARS: &[&str] = &["BINDIR", "CONFIGDIR", "LIBDIR", "LOGDIR", "RUNDIR"];
 
         for line in reader.lines() {
             let line = line?;
@@ -155,7 +148,6 @@ fn main() -> Result<(), Box<dyn Error>> {
     let lib_dir = conf.get("LIBDIR").unwrap();
     let log_dir = conf.get("LOGDIR").unwrap();
     let run_dir = conf.get("RUNDIR").unwrap();
-    let maketool = fs::canonicalize(conf.get("MAKETOOL").unwrap())?;
 
     let root_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
     let cpp_src_dir = root_dir.join(Path::new("src/cpp"));
@@ -186,7 +178,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let proc_count = thread::available_parallelism().map_or(1, |x| x.get());
 
-    assert!(Command::new(maketool)
+    assert!(Command::new("make")
         .args(["-j", &proc_count.to_string()])
         .current_dir(&cpp_src_dir)
         .status()?
diff --git a/configure b/configure
index 2349e7638..6e8ae3c1e 100755
--- a/configure
+++ b/configure
@@ -453,8 +453,6 @@ public:
 			logdir = varprefix + "/log";
 		conf->addExtra(QString("LOGDIR = %1/pushpin").arg(logdir));
 
-		conf->addExtra(QString("MAKETOOL = %1").arg(conf->maketool));
-
 		return true;
 	}
 };
diff --git a/qcm/conf.qcm b/qcm/conf.qcm
index 1a2a661c7..eba1d052e 100644
--- a/qcm/conf.qcm
+++ b/qcm/conf.qcm
@@ -50,8 +50,6 @@ public:
 			logdir = varprefix + "/log";
 		conf->addExtra(QString("LOGDIR = %1/pushpin").arg(logdir));
 
-		conf->addExtra(QString("MAKETOOL = %1").arg(conf->maketool));
-
 		return true;
 	}
 };