Commit: patch 9.1.0623: Mingw: errors when trying to delete non-existing files

[Christian Brabandt]

patch 9.1.0623: Mingw: errors when trying to delete non-existing files

Commit: https://github.com/vim/vim/commit/325420ebe459e7f67b959ce189269b0e8ca9dc12
Author: Ken Takata <ken...@csc.jp>
Date: Fri Jul 26 19:02:11 2024 +0200

patch 9.1.0623: Mingw: errors when trying to delete non-existing files

Problem: Mingw: warnings when trying to delete non-existing files
Solution: Use "rm -f" instead of "rm" to suppress errors for
non-existing files (Ken Takata)

closes: #15350

Signed-off-by: Ken Takata <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak
index 85017d89f..06ec7b6dc 100644
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -29,7 +29,7 @@ LDFLAGS += -static-libgcc -static-libstdc++
endif

ifeq ($(CROSS),yes)
-DEL = rm
+DEL = rm -f
ifeq ($(MINGWOLD),yes)
CXXFLAGS := -O2 -fvtable-thunks
else
@@ -38,7 +38,7 @@ endif
else
CXXFLAGS := -O2
ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
else
DEL = del
endif
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index a0c10b113..bd9d0ac94 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -184,7 +184,7 @@ ifeq ($(CROSS),yes)
ifndef CROSS_COMPILE
CROSS_COMPILE = i586-pc-mingw32msvc-
endif
-DEL = rm
+DEL = rm -f
MKDIR = mkdir -p
DIRSLASH = /
else
@@ -212,7 +212,7 @@ CROSS_COMPILE =
# In this case, unix-like commands can be used.
#
ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
MKDIR = mkdir -p
DIRSLASH = /
else
diff --git a/src/version.c b/src/version.c
index 01aea1f24..e16ad291a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 623,
/**/
622,
/**/
diff --git a/src/xxd/Make_ming.mak b/src/xxd/Make_ming.mak
index 2d3226131..e621e6784 100644
--- a/src/xxd/Make_ming.mak
+++ b/src/xxd/Make_ming.mak
@@ -16,7 +16,7 @@ CC = gcc
CFLAGS = -O2 -Wall -DWIN32 $(DEFINES)

ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
else
DEL = del
endif