Skip to content

Commit cf65d88

Browse files
yegappanbrammool
authored andcommitted
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)
1 parent dad5d2f commit cf65d88

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/INSTALLpc.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,10 @@ Go to the source directory of Vim, then execute the make command. E.g.:
296296

297297
CC=clang
298298
CXX=clang++
299-
make -f Make_ming.mak
299+
# To build Vim without the GUI support
300300
make -f Make_ming.mak GUI=no
301-
make -f Make_ming.mak GUI=yes
301+
# To build Vim with the GUI support
302+
make -f Make_ming.mak GUI=yes XPM=no
302303

303304
To build Vim with the address sanitizer (ASAN), execute the following command:
304305

src/Make_cyg_ming.mak

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,12 @@ MKDIR = mkdir
217217
DIRSLASH = \\
218218
endif
219219
endif
220-
ifeq ($(CC),)
220+
# set $CC to "gcc" unless it matches "clang"
221+
ifeq ($(findstring clang,$(CC)),)
221222
CC := $(CROSS_COMPILE)gcc
222223
endif
223-
ifeq ($(CXX),)
224+
# set $CXX to "g++" unless it matches "clang"
225+
ifeq ($(findstring clang,$(CXX)),)
224226
CXX := $(CROSS_COMPILE)g++
225227
endif
226228
ifeq ($(UNDER_CYGWIN),yes)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
5101,
737739
/**/
738740
5100,
739741
/**/

0 commit comments

Comments
 (0)