Changeset 3340 in kBuild for trunk

Timestamp:

May 19, 2020 12:46:14 PM (5 years ago)

Author:

bird

Message:

tools/VCC141*: Redid the _DLLS variables as it turns out there might be differences between archs.

Location:

trunk/kBuild/tools

Files:

• VCC141.kmk (modified) (2 diffs)
• VCC141AMD64.kmk (modified) (1 diff)
• VCC141X86.kmk (modified) (1 diff)

trunk/kBuild/tools/VCC141.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), targeting AMD64.
+# kBuild Tool Config - Visual C++ 14.1 (aka Visual 2017 and MSC v19.10), default target.
 #
 
@@ -171 +171 @@
 PATH_TOOL_VCC141_REDIST_DEBUG ?= $(PATH_TOOL_VCC141_REDIST)/debug_nonredist
 
-# Updates may add more msvcp140_[0-9].dll images as the product matures.
-# ASSUMES all platforms end up with the same number of DLLs.
+## Updates may add more msvcp140_[0-9].dll images as the product matures.
+# This helper locates them (can differ between archs).
+# @param 1 Redist subdirectory.
+# @param 2 The DLL basename (no suffix).
+# @param 3 The VCC architecture name (for constructing the path).
+FN_TOOL_VCC141_FIND_DLLS = $(2).dll \
+        $(sortfiles $(qnotdir ,$(qwildcard ,$(PATH_TOOL_VCC142_REDIST)/$(3)/$(1)/$(2)_?.dll)))
+
 TOOL_VCC141_REDIST_CRT_SUBDIR       := Microsoft.VC141.CRT
 TOOL_VCC141_REDIST_DEBUG_CRT_SUBDIR := Microsoft.VC141.DebugCRT
-TOOL_VCC141_REDIST_CRT_DLLS    = vcruntime140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/vcruntime140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_CONCRT_DLLS = concrt140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_CPP_DLLS    = msvcp140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/msvcp140_*.dll, x86 x64 arm arm64)))))
-TOOL_VCC141_REDIST_WINRT_DLLS  = vccorlib140.dll \
-        $(sortfiles $(qnotdir ,$(qwildcard ,$(qaddprefix ,$(requote unq,$(PATH_TOOL_VCC141_REDIST)/),\
-                $(addsuffix /$(TOOL_VCC141_REDIST_CRT_SUBDIR)/concrt140_*.dll, x86 x64 arm arm64)))))
+
+TOOL_VCC142_REDIST_CRT_DLLS.x86      = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x86)
+TOOL_VCC142_REDIST_CRT_DLLS.amd64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,x64)
+TOOL_VCC142_REDIST_CRT_DLLS.arm32    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm)
+TOOL_VCC142_REDIST_CRT_DLLS.arm64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vcruntime140,arm64)
+TOOL_VCC142_REDIST_CRT_DLLS          = $(TOOL_VCC142_REDIST_CRT_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_CONCRT_DLLS.x86   = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x86)
+TOOL_VCC142_REDIST_CONCRT_DLLS.amd64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,x64)
+TOOL_VCC142_REDIST_CONCRT_DLLS.arm32 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm)
+TOOL_VCC142_REDIST_CONCRT_DLLS.arm64 = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),concrt140,arm64)
+TOOL_VCC142_REDIST_CONCRT_DLLS       = $(TOOL_VCC142_REDIST_CONCRT_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_CPP_DLLS.x86      = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x86)
+TOOL_VCC142_REDIST_CPP_DLLS.amd64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,x64)
+TOOL_VCC142_REDIST_CPP_DLLS.arm32    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm)
+TOOL_VCC142_REDIST_CPP_DLLS.arm64    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),msvcp140,arm64)
+TOOL_VCC142_REDIST_CPP_DLLS          = $(TOOL_VCC142_REDIST_CPP_DLLS.$(KBUILD_TARGET_ARCH))
+
+TOOL_VCC142_REDIST_WINRT_DLLS.x86    = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x86)
+TOOL_VCC142_REDIST_WINRT_DLLS.amd64  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,x64)
+TOOL_VCC142_REDIST_WINRT_DLLS.arm32  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm)
+TOOL_VCC142_REDIST_WINRT_DLLS.arm64  = $(call FN_TOOL_VCC142_FIND_DLLS,$(TOOL_VCC142_REDIST_CRT_SUBDIR),vccorlib140,arm64)
+TOOL_VCC142_REDIST_WINRT_DLLS        = $(TOOL_VCC142_REDIST_WINRT_DLLS.$(KBUILD_TARGET_ARCH))
 
 TOOL_VCC141_REDIST_CXXAMP_SUBDIR := Microsoft.VC141.CXXAMP

trunk/kBuild/tools/VCC141AMD64.kmk

@@ -118 +118 @@
 PATH_TOOL_VCC141AMD64_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x64
 PATH_TOOL_VCC141AMD64_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141AMD64_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+TOOL_VCC141AMD64_REDIST_CRT_DLLS        = $(TOOL_VCC141_REDIST_CRT_DLLS.amd64)
+TOOL_VCC141AMD64_REDIST_CONCRT_DLLS     = $(TOOL_VCC141_REDIST_CONCRT_DLLS.amd64)
+TOOL_VCC141AMD64_REDIST_CPP_DLLS        = $(TOOL_VCC141_REDIST_CPP_DLLS.amd64)
+TOOL_VCC141AMD64_REDIST_WINRT_DLLS      = $(TOOL_VCC141_REDIST_WINRT_DLLS.amd64)
+
 
 #

trunk/kBuild/tools/VCC141X86.kmk

@@ -118 +118 @@
 PATH_TOOL_VCC141X86_REDIST_DEBUG     ?= $(PATH_TOOL_VCC141_REDIST_DEBUG)/x86
 PATH_TOOL_VCC141X86_REDIST_DEBUG_CRT  = $(PATH_TOOL_VCC141X86_REDIST_DEBUG)/$(TOOL_VCC141_REDIST_CRT_SUBDIR)
+TOOL_VCC141X64_REDIST_CRT_DLLS        = $(TOOL_VCC141_REDIST_CRT_DLLS.x86)
+TOOL_VCC141X64_REDIST_CONCRT_DLLS     = $(TOOL_VCC141_REDIST_CONCRT_DLLS.x86)
+TOOL_VCC141X64_REDIST_CPP_DLLS        = $(TOOL_VCC141_REDIST_CPP_DLLS.x86)
+TOOL_VCC141X64_REDIST_WINRT_DLLS      = $(TOOL_VCC141_REDIST_WINRT_DLLS.x86)
+
 
 #