Changeset 3638 in kBuild for trunk

Timestamp:

Nov 2, 2024 11:38:38 PM (6 months ago)

Author:

bird

Message:

Config.kmk: Adjustments for cross-building win.arm64.

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -265 +265 @@
    TEMPLATE_BIN_SDKS            = WINSDK10-UM WINSDK10-UCRT-STATIC
    TEMPLATE_BIN_CFLAGS         += -MT
-   TEMPLATE_BIN_LIBS            = \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/vcruntime.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
+   TEMPLATE_BIN_LATE_LIBS.x86  = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/libcpmt.lib
+   TEMPLATE_BIN_LATE_LIBS.amd64  = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/libcpmt.lib
+   TEMPLATE_BIN_LATE_LIBS.arm64  = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/libcpmt.lib
   else
    TEMPLATE_BIN_SDKS            = WINSDK10-UM WINSDK10-UCRT
    TEMPLATE_BIN_CFLAGS         += -MD
-   TEMPLATE_BIN_LIBS            = \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/vcruntime.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.$(KBUILD_TARGET_ARCH))_LIB)/msvcrt.lib
+   TEMPLATE_BIN_LATE_LIBS.x86   = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.x86)_LIB)/msvcrt.lib
+   TEMPLATE_BIN_LATE_LIBS.amd64 = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.amd64)_LIB)/msvcrt.lib
+   TEMPLATE_BIN_LATE_LIBS.arm64 = \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.arm64)_LIB)/vcruntime.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.arm64)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_BIN_TOOL.arm64)_LIB)/msvcrt.lib
   endif
  else ifeq ($(KBUILD_TYPE),profile)