Lookup at gpatch before patch on macOS now that both homebrew and mac…

…ports expose gpatch as gpatch Homebrew changed behaviour in Homebrew/homebrew-core#174687
kit-ty-kate · Oct 22, 2024 · 0fc233a · 0fc233a
1 parent f0ba0c2
commit 0fc233a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -66,6 +66,7 @@ users)
 ## Opamfile
 
 ## External dependencies
+  * Lookup at `gpatch` before `patch` on macOS now that both homebrew and macports expose `gpatch` as `gpatch` since Homebrew/homebrew-core#174687 [#6255 @kit-ty-kate]
 
 ## Format upgrade
 

diff --git a/src/core/opamSystem.ml b/src/core/opamSystem.ml
@@ -1570,12 +1570,12 @@ let gpatch = lazy begin
   in
   let default_cmd, other_cmds =
     match OpamStd.Sys.os () with
+    | Darwin
     | DragonFly
     | FreeBSD
     | NetBSD
     | OpenBSD -> ("gpatch", ["patch"])
     | Cygwin
-    | Darwin
     | Linux
     | Unix
     | Win32