diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2022-06-15 18:31:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-15 18:31:45 +0100 |
| commit | cf65d88ff844f042337dfd043e6e98f3b9270577 (patch) | |
| tree | 762f0ea9819548fb8814006cd307b3ec29a51d48 | |
| parent | dad5d2f87b867dab48ac265e3d978d86f0541493 (diff) | |
| download | vim-git-cf65d88ff844f042337dfd043e6e98f3b9270577.tar.gz | |
patch 8.2.5101: MS-Windows with MinGW: $CC may be "cc" instead of "gcc"v8.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)
| -rw-r--r-- | src/INSTALLpc.txt | 5 | ||||
| -rw-r--r-- | src/Make_cyg_ming.mak | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 1c50dd183..43d024a4a 100644 --- 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 61df9a746..9c004fa8d 100644 --- 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 74e859552..3e64ae468 100644 --- 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, |