Merge pull request #3853 from kit-ty-kate/fix-gmake

Fix %{make} on Windows
ocaml · Oct 14, 2020 · 4a2f9ba · 4a2f9ba
2 parents 5cfd93b + 45732b8
commit 4a2f9ba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -44,6 +44,10 @@ Unreleased
   installed and to be usable by other public libraries in the same project
   (#3655, fixes #1017, @rgrinberg)
 
+- Fix the `%{make}` variable on Windows by only checking for a `gmake` binary
+  on UNIX-like systems as a unrelated `gmake` binary might exist on Windows.
+  (#3853, @kit-ty-kate)
+
 2.7.1 (2/09/2020)
 -----------------
 

diff --git a/src/stdune/bin.ml b/src/stdune/bin.ml
@@ -41,6 +41,12 @@ let which ~path prog =
       Option.some_if (exists fn) fn)
 
 let make ~path =
-  match which ~path "gmake" with
+  let gmake =
+    if Sys.unix then
+      which ~path "gmake"
+    else
+      None
+  in
+  match gmake with
   | None -> which ~path "make"
   | some -> some