To: vim_dev@googlegroups.com Subject: Patch 8.2.5101 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.5101 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) Files: src/INSTALLpc.txt, src/Make_cyg_ming.mak *** ../vim-8.2.5100/src/INSTALLpc.txt 2022-06-14 12:30:21.825678772 +0100 --- src/INSTALLpc.txt 2022-06-15 18:15:26.261691148 +0100 *************** *** 296,304 **** CC=clang CXX=clang++ ! make -f Make_ming.mak make -f Make_ming.mak GUI=no ! make -f Make_ming.mak GUI=yes To build Vim with the address sanitizer (ASAN), execute the following command: --- 296,305 ---- CC=clang CXX=clang++ ! # To build Vim without the GUI support make -f Make_ming.mak GUI=no ! # 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: *** ../vim-8.2.5100/src/Make_cyg_ming.mak 2022-06-14 12:30:21.825678772 +0100 --- src/Make_cyg_ming.mak 2022-06-15 18:22:28.487489031 +0100 *************** *** 217,226 **** DIRSLASH = \\ endif endif ! ifeq ($(CC),) CC := $(CROSS_COMPILE)gcc endif ! ifeq ($(CXX),) CXX := $(CROSS_COMPILE)g++ endif ifeq ($(UNDER_CYGWIN),yes) --- 217,228 ---- DIRSLASH = \\ endif endif ! # set $CC to "gcc" unless it matches "clang" ! ifeq ($(findstring clang,$(CC)),) CC := $(CROSS_COMPILE)gcc endif ! # set $CXX to "g++" unless it matches "clang" ! ifeq ($(findstring clang,$(CXX)),) CXX := $(CROSS_COMPILE)g++ endif ifeq ($(UNDER_CYGWIN),yes) *** ../vim-8.2.5100/src/version.c 2022-06-15 18:08:38.572470832 +0100 --- src/version.c 2022-06-15 18:20:20.568057431 +0100 *************** *** 736,737 **** --- 736,739 ---- { /* Add new patch number below this line */ + /**/ + 5101, /**/ -- TERRY GILLIAM PLAYED: PATSY (ARTHUR'S TRUSTY STEED), THE GREEN KNIGHT SOOTHSAYER, BRIDGEKEEPER, SIR GAWAIN (THE FIRST TO BE KILLED BY THE RABBIT) "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///