# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1655315104 -7200
# Node ID 9288c636ffa5444d8716d6eec2b5e006180e8e69
# Parent  33cf68d4d26e7f32c41f957d2e25e87cafbc9e2c
patch 8.2.5101: MS-Windows with MinGW: $CC may be "cc" instead of "gcc"

Commit: https://github.com/vim/vim/commit/cf65d88ff844f042337dfd043e6e98f3b9270577
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date:   Wed Jun 15 18:31:45 2022 +0100

    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
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -296,9 +296,10 @@ Go to the source directory of Vim, then 
 
     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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5101,
+/**/
     5100,
 /**/
     5099,