Skip to content

Commit 2a3b608

Browse files
koronchrisbra
authored andcommitted
patch 9.1.2053: MS-Windows: May use wrong find command
Problem: If another find.exe derived from findutils is installed on Windows, unintended behavior will occur. If MSYS2 is installed and prioritized over the system path, then find.exe derived from findutils will be launched during build, resulting in an unintended warning message. Solution: Specify the absolute path including SYSTEMROOT to launch find.exe (Muraoka Taro) closes: #19081 Signed-off-by: Muraoka Taro <koron.kaoriya@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent a5b1960 commit 2a3b608

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/auto/nmake/tools.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PSFLAGS = -NoLogo -NoProfile -Command
2323
!ERROR The PowerShell program version 3.0 or higher is required for work.
2424
!ENDIF
2525

26-
!IF ![echo $(COMSPEC) | 1> nul find "cmd.exe"]
26+
!IF ![echo $(COMSPEC) | 1> nul $(SYSTEMROOT)\System32\find.exe "cmd.exe"]
2727
CMD = $(COMSPEC)
2828
!ELSE
2929
CMD = $(SYSTEMROOT)\System32\cmd.exe

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
2053,
737739
/**/
738740
2052,
739741
/**/

0 commit comments

Comments
 (0)