Changeset 3623 for trunk/kBuild

Timestamp:

Oct 22, 2024, 10:22:02 AM (9 months ago)

Author:

bird

Message:

tools/VCC143.kmk: Seems vcruntime140_threads.dll isn't always installed, so detect it.

File:

• trunk/kBuild/tools/VCC143.kmk (modified) (2 diffs)

trunk/kBuild/tools/VCC143.kmk

@@ -58 +58 @@
        ifeq ($(PATH_TOOL_VCC143),)
         $(warning kBuild: PATH_TOOL_VCC143 cannot be determined!)
-        PATH_TOOL_VCC143 := $(KBUILD_DEVTOOLS)/win/vcc/v14.3
+        PATH_TOOL_VCC143 := $(KBUILD_DEVTOOLS)/win/vcc/v14.3/Tools/MSVC/14.30.00000
        endif
       endif
@@ -189 +189 @@
         $(versortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC143_REDIST)/$(3)/$(1)/$(2)_?.dll)))
 
+## This is for finding vcruntime140_thread.dll and other one-offs.
+# @param 1 Redist subdirectory.
+# @param 2 The full DLL name.
+# @param 3 The VCC architecture name (for constructing the path).
+FN_TOOL_VCC143_FIND_1_DLL = \
+        $(versortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC143_REDIST)/$(3)/$(1)/$(2))))
+
 TOOL_VCC143_REDIST_CRT_SUBDIR       := Microsoft.VC143.CRT
 TOOL_VCC143_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC143.DebugCRT
 
-TOOL_VCC143_REDIST_CRT_DLLS.x86      = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x86)   vcruntime140_threads.dll
-TOOL_VCC143_REDIST_CRT_DLLS.amd64    = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x64)   vcruntime140_threads.dll
-TOOL_VCC143_REDIST_CRT_DLLS.arm32    = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm)   vcruntime140_threads.dll
-TOOL_VCC143_REDIST_CRT_DLLS.arm64    = $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm64) vcruntime140_threads.dll
+TOOL_VCC143_REDIST_CRT_DLLS.x86      = \
+        $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x86) \
+        $(call FN_TOOL_VCC143_FIND_1_DLL,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140_threads.dll,x86)
+TOOL_VCC143_REDIST_CRT_DLLS.amd64    = \
+        $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,x64) \
+        $(call FN_TOOL_VCC143_FIND_1_DLL,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140_threads.dll,x64)
+TOOL_VCC143_REDIST_CRT_DLLS.arm32    = \
+        $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm) \
+        $(call FN_TOOL_VCC143_FIND_1_DLL,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140_threads.dll,arm)
+TOOL_VCC143_REDIST_CRT_DLLS.arm64    = \
+        $(call FN_TOOL_VCC143_FIND_DLLS,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140,arm64) \
+        $(call FN_TOOL_VCC143_FIND_1_DLL,$(TOOL_VCC143_REDIST_CRT_SUBDIR),vcruntime140_threads.dll,arm64)
 TOOL_VCC143_REDIST_CRT_DLLS          = $(TOOL_VCC143_REDIST_CRT_DLLS.$(KBUILD_TARGET_ARCH))