patch 8.2.5101: MS-Windows with MinGW: $CC may be "cc" instead of "gcc"

Problem:    MS-Windows with MinGW: $CC may be "cc" instead of "gcc".
Solution:   Set $CC if it is not matching "clang". (Yegappan Lakshmanan,
            closes #10578)

diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index 1c50dd183ce026080cc665f0b3ab8ecee118eab9..43d024a4a35105f9c770afb9dbf92ea65226ccb5 100644 (file)
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -296,9 +296,10 @@ Go to the source directory of Vim, then execute the make command.  E.g.:
 
     CC=clang
     CXX=clang++
-    make -f Make_ming.mak
+    # To build Vim without the GUI support
     make -f Make_ming.mak GUI=no
-    make -f Make_ming.mak GUI=yes
+    # To build Vim with the GUI support
+    make -f Make_ming.mak GUI=yes XPM=no
 
 To build Vim with the address sanitizer (ASAN), execute the following command:
 

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 61df9a74615d94b5e1cc2e0f406685134d3830f7..9c004fa8d209453471df352f60827c5629778e82 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -217,10 +217,12 @@ MKDIR = mkdir
 DIRSLASH = \\
  endif
 endif
-ifeq ($(CC),)
+# set $CC to "gcc" unless it matches "clang"
+ifeq ($(findstring clang,$(CC)),)
 CC := $(CROSS_COMPILE)gcc
 endif
-ifeq ($(CXX),)
+# set $CXX to "g++" unless it matches "clang"
+ifeq ($(findstring clang,$(CXX)),)
 CXX := $(CROSS_COMPILE)g++
 endif
 ifeq ($(UNDER_CYGWIN),yes)

diff --git a/src/version.c b/src/version.c
index 74e859552444aba3997a946167101a651fb93517..3e64ae468d23a4616dd1da6c6bffa0d897595d78 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5101,
 /**/
     5100,
 /**/