From e73528e76362e8203d55b5ff6829f451cfbdf2b7 Mon Sep 17 00:00:00 2001 From: David Allsopp 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. --- master_changes.md | 1 + src/state/opamEnv.ml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/master_changes.md b/master_changes.md index 8f559742d8a..d6cb45c0652 100644 --- a/master_changes.md +++ b/master_changes.md @@ -80,6 +80,7 @@ users) * [BUG] Fix `x-env-path-rewrite` splitting of values when reverting [#5935 @dra27 - fix #5838] * [BUG] Rework the logic of := and =: so that an empty entry is correctly preserved on multiple updates [#5935 @dra27 - fix #5926] * [BUG] Fix incorrect reverting of `=+` and `=:` [#5935 @dra27 - fix #5926] + * For the `Cygwin` internal operator, don't allow `make.exe` to become shadowed [#5996 @dra27] ## Opamfile diff --git a/src/state/opamEnv.ml b/src/state/opamEnv.ml index 6922c9df87a..b3f3257e701 100644 --- a/src/state/opamEnv.ml +++ b/src/state/opamEnv.ml @@ -315,7 +315,7 @@ let apply_op_zip ~sepfmt var op arg (rl1,l2 as zip) = in let shadow_list = List.filter (contains_in arg) - ["bash.exe"; "sort.exe"; "tar.exe"; "git.exe"] + ["bash.exe"; "make.exe"; "sort.exe"; "tar.exe"; "git.exe"] in let rec loop acc = function | [] -> acc, [arg]