diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-07-26 19:02:11 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-26 19:07:48 +0200 |
| commit | 325420ebe459e7f67b959ce189269b0e8ca9dc12 (patch) | |
| tree | cd39c6d527a7ef1f72f9ec91862a17b3028f41c1 | |
| parent | 032accd98b6915b5d642a2d059cc666c2c786579 (diff) | |
patch 9.1.0623: Mingw: errors when trying to delete non-existing filesv9.1.0623
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 <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/GvimExt/Make_ming.mak | 4 | ||||
| -rw-r--r-- | src/Make_cyg_ming.mak | 4 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/Make_ming.mak | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/GvimExt/Make_ming.mak b/src/GvimExt/Make_ming.mak index 85017d89f7..06ec7b6dc5 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 a0c10b1130..bd9d0ac945 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 01aea1f24d..e16ad291a4 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 623, +/**/ 622, /**/ 621, diff --git a/src/xxd/Make_ming.mak b/src/xxd/Make_ming.mak index 2d32261314..e621e67841 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 |