changeset 29163:9288c636ffa5 v8.2.5101

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)
author Bram Moolenaar <Bram@vim.org>
date Wed, 15 Jun 2022 19:45:04 +0200
parents 33cf68d4d26e
children 152286f40341
files src/INSTALLpc.txt src/Make_cyg_ming.mak src/version.c
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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:
 
--- 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)
--- 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,