mirror of
				https://github.com/vim/vim.git
				synced 2025-10-30 09:47:20 -04:00 
			
		
		
		
	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 <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
			
			
This commit is contained in:
		
				
					committed by
					
						 Christian Brabandt
						Christian Brabandt
					
				
			
			
				
	
			
			
			
						parent
						
							032accd98b
						
					
				
				
					commit
					325420ebe4
				
			| @@ -29,7 +29,7 @@ LDFLAGS += -static-libgcc -static-libstdc++ | |||||||
| endif | endif | ||||||
|  |  | ||||||
| ifeq ($(CROSS),yes) | ifeq ($(CROSS),yes) | ||||||
| DEL = rm | DEL = rm -f | ||||||
| ifeq ($(MINGWOLD),yes) | ifeq ($(MINGWOLD),yes) | ||||||
| CXXFLAGS := -O2 -fvtable-thunks | CXXFLAGS := -O2 -fvtable-thunks | ||||||
| else | else | ||||||
| @@ -38,7 +38,7 @@ endif | |||||||
| else | else | ||||||
| CXXFLAGS := -O2 | CXXFLAGS := -O2 | ||||||
| ifneq (sh.exe, $(SHELL)) | ifneq (sh.exe, $(SHELL)) | ||||||
| DEL = rm | DEL = rm -f | ||||||
| else | else | ||||||
| DEL = del | DEL = del | ||||||
| endif | endif | ||||||
|   | |||||||
| @@ -184,7 +184,7 @@ ifeq ($(CROSS),yes) | |||||||
|  ifndef CROSS_COMPILE |  ifndef CROSS_COMPILE | ||||||
| CROSS_COMPILE = i586-pc-mingw32msvc- | CROSS_COMPILE = i586-pc-mingw32msvc- | ||||||
|  endif |  endif | ||||||
| DEL = rm | DEL = rm -f | ||||||
| MKDIR = mkdir -p | MKDIR = mkdir -p | ||||||
| DIRSLASH = / | DIRSLASH = / | ||||||
| else | else | ||||||
| @@ -212,7 +212,7 @@ CROSS_COMPILE = | |||||||
| # In this case, unix-like commands can be used. | # In this case, unix-like commands can be used. | ||||||
| # | # | ||||||
|  ifneq (sh.exe, $(SHELL)) |  ifneq (sh.exe, $(SHELL)) | ||||||
| DEL = rm | DEL = rm -f | ||||||
| MKDIR = mkdir -p | MKDIR = mkdir -p | ||||||
| DIRSLASH = / | DIRSLASH = / | ||||||
|  else |  else | ||||||
|   | |||||||
| @@ -704,6 +704,8 @@ static char *(features[]) = | |||||||
|  |  | ||||||
| static int included_patches[] = | static int included_patches[] = | ||||||
| {   /* Add new patch number below this line */ | {   /* Add new patch number below this line */ | ||||||
|  | /**/ | ||||||
|  |     623, | ||||||
| /**/ | /**/ | ||||||
|     622, |     622, | ||||||
| /**/ | /**/ | ||||||
|   | |||||||
| @@ -16,7 +16,7 @@ CC = gcc | |||||||
| CFLAGS = -O2 -Wall -DWIN32 $(DEFINES) | CFLAGS = -O2 -Wall -DWIN32 $(DEFINES) | ||||||
|  |  | ||||||
| ifneq (sh.exe, $(SHELL)) | ifneq (sh.exe, $(SHELL)) | ||||||
| DEL = rm | DEL = rm -f | ||||||
| else | else | ||||||
| DEL = del | DEL = del | ||||||
| endif | endif | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user