Merge pull request #18404 from pshipton/vs2022jit

Update JIT UMA link step to include ucrt, vcruntime for VS2022
eclipse-openj9 · Nov 7, 2023 · bb39169 · bb39169
2 parents 648c16f + c73eac5
commit bb39169
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/runtime/compiler/build/toolcfg/win-msvc/common.mk b/runtime/compiler/build/toolcfg/win-msvc/common.mk
@@ -214,11 +214,11 @@ SOLINK_LIBPATH+=$(PRODUCT_LIBPATH)
 SOLINK_SLINK+=$(PRODUCT_SLINK) j9thr j9hookable kernel32 oldnames msvcrt msvcprt ws2_32
 
 ifeq ($(origin MSVC_VERSION), undefined)
-    ifneq (,$(filter 14.0 15.0, $(VisualStudioVersion)))
+    ifneq (,$(filter 14.0 15.0 16.0 17.0, $(VisualStudioVersion)))
         SOLINK_SLINK+=ucrt vcruntime
     endif
 else
-    ifneq (,$(filter 2013 2015 2017 2019, $(MSVC_VERSION)))
+    ifneq (,$(filter 2013 2015 2017 2019 2022, $(MSVC_VERSION)))
         SOLINK_SLINK+=ucrt vcruntime
     endif
 endif