diff options
author | K.Takata <kentkt@csc.jp> | 2022-01-26 16:20:21 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-01-26 16:20:21 +0000 |
commit | 47d1666d605998a97d3827eca4d467ad0930b284 (patch) | |
tree | b61a572d2361815c6a28b2de9783354a40948064 /src | |
parent | a827bf3ea8fe465aa456ef7a7a37d6afe6a47628 (diff) |
patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CIv8.2.4222
Problem: MS-Windows: clumsy way to suppress progress on CI.
Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
Diffstat (limited to 'src')
-rw-r--r-- | src/Make_mvc.mak | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index cb66fc7962..a8d50001f2 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1279,10 +1279,16 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \ $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) -# Report link time code generation progress if used. +# Enable link time code generation if needed. !ifdef NODEBUG ! if "$(OPTIMIZE)" != "SPACE" +! if "$(CI)" == "true" || "$(CI)" == "True" +# Enable link time code generation, but do not show the progress. +LINKARGS1 = $(LINKARGS1) /LTCG +! else +# Report link time code generation progress. LINKARGS1 = $(LINKARGS1) /LTCG:STATUS +! endif ! endif !endif diff --git a/src/version.c b/src/version.c index 3d4fac60f0..db051aa27b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4222, +/**/ 4221, /**/ 4220, |