Changeset 3326 for trunk/kBuild/tools/VCC141X86.kmk

Timestamp:

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

Author:

bird

Message:

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

File:

• trunk/kBuild/tools/VCC141X86.kmk (modified) (5 diffs)

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) \