This is an automated email from the ASF dual-hosted git repository.
mturk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new eb0e2be4b Add STATIC_CRT=Hybrid compile time option that creates
'Hybrid CRT' technique which uses Universal CRT AND the static CRT
eb0e2be4b is described below
commit eb0e2be4b32aba66d6a7f1d010ade6fb772a3e61
Author: Mladen Turk <[email protected]>
AuthorDate: Tue Aug 8 12:32:40 2023 +0200
Add STATIC_CRT=Hybrid compile time option that creates 'Hybrid CRT'
technique which uses Universal CRT AND the static CRT
---
native/NMAKEmakefile.inc | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc
index 2c641a5cc..2ed45329d 100644
--- a/native/NMAKEmakefile.inc
+++ b/native/NMAKEmakefile.inc
@@ -245,7 +245,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS)
!ENDIF
# Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib shell32.lib rpcrt4.lib
+LIBS = kernel32.lib advapi32.lib ws2_32.lib shell32.lib rpcrt4.lib
# Extra libs from command line or env
!IF DEFINED(EXTRA_LIBS)
LIBS = $(LIBS) $(EXTRA_LIBS)
@@ -265,6 +265,9 @@ COMMON_LFLAGS = /NOLOGO /MACHINE:$(MACHINE)
OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
!IF "$(BUILD)" == "RELEASE"
OPT_LFLAGS = /OPT:REF $(OPT_LFLAGS)
+!IF DEFINED(STATIC_CRT) && "$(STATIC_CRT)" == "Hybrid"
+OPT_LFLAGS = $(OPT_LFLAGS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib
+!ENDIF
!ENDIF
!IF "$(TARGET)" == "EXE"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
