Changeset 3326 in kBuild

Timestamp:

Apr 17, 2020 7:10:19 PM (5 years ago)

Author:

bird

Message:

tools/VCC141*.kmk: More work on the Visual C++ 14.1 tools.

Location:

trunk/kBuild/tools

Files:

• VCC141.kmk (modified) (5 diffs)
• VCC141X86.kmk (modified) (5 diffs)

trunk/kBuild/tools/VCC141.kmk

@@ -79 +79 @@
 PATH_TOOL_VCC141_BIN_QSH  := $(requote sh,$(PATH_TOOL_VCC141_BIN))
 
+# A bunch of DLLs are only in the subdir matching the host one, so we need to add it to the PATH when cross compiling.
+ifndef PATH_TOOL_VCC141_HOST_DLL_BIN
+PATH_TOOL_VCC141_HOST_DLL_BIN := $(PATH_TOOL_VCC141_HOST_BIN)/$(WINCMN_MAP_ARCH.$(KBUILD_HOST_ARCH))
+endif
+ifndef PATH_TOOL_VCC141_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141_BIN))
+PATH_TOOL_VCC141_DLL_BIN      := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
+ endif
+endif
+
 PATH_TOOL_VCC141_LIB.amd64         ?= $(PATH_TOOL_VCC141)/lib/x64
 PATH_TOOL_VCC141_LIB.arm32         ?= $(PATH_TOOL_VCC141)/lib/arm
@@ -113 +123 @@
   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141_BIN)),-3),64/)
    TOOL_VCC141_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
-   TOOL_VCC141_KSUBMIT_DD = $(TOOL_VCC141_KSUBMIT) --
   else
    TOOL_VCC141_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-   TOOL_VCC141_KSUBMIT_DD = $(TOOL_VCC141_KSUBMIT) --
   endif
- endif
-endif
+  ifdef PATH_TOOL_VCC141_DLL_BIN
+   TOOL_VCC141_KSUBMIT := $(TOOL_VCC141_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141_DLL_BIN));"
+  endif
+  TOOL_VCC141_KSUBMIT_DD := $(TOOL_VCC141_KSUBMIT) --
+ endif
+endif
+ifdef PATH_TOOL_VCC141_DLL_BIN
+ TOOL_VCC141_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC141_KSUBMIT_DD
+  TOOL_VCC141_KSUBMIT_DD := $(TOOL_VCC141_SETUP_ENV)
+ endif
+endif
+
 
 ## Helper for finding rc.exe and mt.exe in the SDK.
-TOOL_VCC141_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(firstfile  \
+TOOL_VCC141_FN_FIND_SDK_TOOL_SUB = $(eval $3 := $(qfirstfile sh,\
        $(if-expr defined(PATH_SDK_WINSDK10_BIN) , $(qwildcard ,$(PATH_SDK_WINSDK10_BIN)/$2)) \
        $(if-expr defined(PATH_SDK_WINPSDK71_BIN), $(qwildcard ,$(PATH_SDK_WINPSDK71_BIN)/$2)) \
@@ -209 +228 @@
 else
  define TOOL_VCC141_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141_CC) -c\
+        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -251 +270 @@
 else
  define TOOL_VCC141_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141_CXX) -c\
+        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -297 +316 @@
  define TOOL_VCC141-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC141_SETUP_ENV) $(TOOL_VCC141_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \

trunk/kBuild/tools/VCC141X86.kmk

@@ -54 +54 @@
 endif
 PATH_TOOL_VCC141X86_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141X86_BIN))
+
+# A bunch of DLLs are only in the subdir matching the host one, so we need to add it to the PATH when cross compiling.
+ifndef PATH_TOOL_VCC141X86_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141X86_BIN))
+PATH_TOOL_VCC141X86_DLL_BIN := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
+ endif
+endif
 
 ifndef PATH_TOOL_VCC141X86_LIB
@@ -90 +97 @@
   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141X86_BIN)),-3),64/)
    TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
-   TOOL_VCC141X86_KSUBMIT_DD = $(TOOL_VCC141X86_KSUBMIT) --
   else
    TOOL_VCC141X86_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-   TOOL_VCC141X86_KSUBMIT_DD = $(TOOL_VCC141X86_KSUBMIT) --
   endif
+  ifdef PATH_TOOL_VCC141X86_DLL_BIN
+   TOOL_VCC141X86_KSUBMIT := $(TOOL_VCC141X86_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141X86_DLL_BIN));"
+  endif
+  TOOL_VCC141X86_KSUBMIT_DD := $(TOOL_VCC141X86_KSUBMIT) --
+ endif
+endif
+ifdef PATH_TOOL_VCC141X86_DLL_BIN
+ TOOL_VCC141X86_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141X86_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC141X86_KSUBMIT_DD
+  TOOL_VCC141X86_KSUBMIT_DD := $(TOOL_VCC141X86_SETUP_ENV)
  endif
 endif
@@ -165 +180 @@
 else
  define TOOL_VCC141X86_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141X86_CC) -c\
+        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -207 +222 @@
 else
  define TOOL_VCC141X86_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141X86_CXX) -c\
+        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -253 +268 @@
  define TOOL_VCC141X86-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141X86_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC141X86_SETUP_ENV)$(TOOL_VCC141X86_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \