From 3435530177d8e852f9ae6049cfdc2aafc955656f Mon Sep 17 00:00:00 2001
From: David Allsopp <david.allsopp@metastack.com>
Date: Wed, 5 Jun 2024 21:53:32 +0100
Subject: [PATCH] Don't allow make to become shadowed

Deals with old installations of mingw64, in particular on GitHub
Actions.
---
 src/state/opamEnv.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/state/opamEnv.ml b/src/state/opamEnv.ml
index e5caa27519c..9bf42825e5e 100644
--- a/src/state/opamEnv.ml
+++ b/src/state/opamEnv.ml
@@ -307,7 +307,7 @@ let rezip_to_string ?insert z =
   join_var (rezip ?insert z)
 
 let cygwin_non_shadowed_programs =
-  ["bash.exe"; "sort.exe"; "tar.exe"]
+  ["bash.exe"; "sort.exe"; "tar.exe"; "make.exe"]
 
 let apply_op_zip ~sepfmt var op arg (rl1,l2 as zip) =
   let arg = transform_format ~sepfmt var arg in