Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't allow make to become shadowed #5996

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Don't allow make to become shadowed #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/state/opamEnv.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading