diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-07-29 20:43:21 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-29 20:43:21 +0200 |
| commit | 3da011871a494ee5f3172278b6209afc6345fb5a (patch) | |
| tree | a2f1ed45918365d6dde178ed0c6b92f180601477 | |
| parent | 0bee82b1d0a46a6ca6fb4ffcebd6a63d4141a355 (diff) | |
patch 9.1.0640: Mingw: Makefile can be improvedv9.1.0640
Problem: Mingw: Makefile can be improved
Solution: Reduce nesting level, directly check if the '-Wl,--entry'
option is required (Ken Takata)
closes: #15386
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/Make_cyg_ming.mak | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 7c324fb64f..d3b04e813a 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -1140,15 +1140,14 @@ $(EXEOBJG): | $(OUTDIR) $(EXEOBJC): | $(OUTDIR) ifeq ($(VIMDLL),yes) - ifneq ($(COVERAGE),yes) - ifndef MZSCHEME - ifeq ($(ARCH),x86-64) + ifneq ($(findstring -nostdlib,$(EXELFLAGS)),) + # -Wl,--entry needs to be specified when -nostdlib is used. + ifeq ($(ARCH),x86-64) EXEENTRYC = -Wl,--entry=wmainCRTStartup EXEENTRYG = -Wl,--entry=wWinMainCRTStartup - else ifeq ($(ARCH),i686) + else ifeq ($(ARCH),i686) EXEENTRYC = -Wl,--entry=_wmainCRTStartup EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0 - endif endif endif diff --git a/src/version.c b/src/version.c index 97414a08a3..53c1118937 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 640, +/**/ 639, /**/ 638, |