Changeset 3331 for trunk/kBuild/tools

Timestamp:

Apr 20, 2020, 12:40:21 AM (5 years ago)

Author:

bird

Message:

tools/VCC141AMD64.kmk: Add host DLL bin dir to the PATH if the host isn't AMD64.

File:

• trunk/kBuild/tools/VCC141AMD64.kmk (modified) (6 diffs)

trunk/kBuild/tools/VCC141AMD64.kmk

@@ -54 +54 @@
 endif
 PATH_TOOL_VCC141AMD64_BIN_QSH := $(requote sh,$(PATH_TOOL_VCC141AMD64_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_VCC141AMD64_DLL_BIN
+ ifneq ($(PATH_TOOL_VCC141_HOST_DLL_BIN),$(PATH_TOOL_VCC141AMD64_BIN))
+PATH_TOOL_VCC141AMD64_DLL_BIN := $(PATH_TOOL_VCC141_HOST_DLL_BIN)
+ endif
+endif
 
 ifndef PATH_TOOL_VCC141AMD64_LIB
@@ -90 +97 @@
   ifneq ($(substr $(qdir un,$(PATH_TOOL_VCC141AMD64_BIN)),-3),64/)
    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --64-bit
-   TOOL_VCC141AMD64_KSUBMIT_DD = $(TOOL_VCC141AMD64_KSUBMIT) --
   else
    TOOL_VCC141AMD64_KSUBMIT ?= kmk_builtin_kSubmit --32-bit
-   TOOL_VCC141AMD64_KSUBMIT_DD = $(TOOL_VCC141AMD64_KSUBMIT) --
   endif
+  ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
+   TOOL_VCC141AMD64_KSUBMIT := $(TOOL_VCC141AMD64_KSUBMIT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));"
+  endif
+  TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_KSUBMIT) --
+ endif
+endif
+ifdef PATH_TOOL_VCC141AMD64_DLL_BIN
+ TOOL_VCC141AMD64_SETUP_ENV   := $(REDIRECT) --prepend "PATH=$(requote shell-in-dq,$(PATH_TOOL_VCC141AMD64_DLL_BIN));" --$(SP)
+ ifndef TOOL_VCC141AMD64_KSUBMIT_DD
+  TOOL_VCC141AMD64_KSUBMIT_DD := $(TOOL_VCC141AMD64_SETUP_ENV)
  endif
 endif
@@ -103 +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)
-
 
 #
@@ -171 +185 @@
 else
  define TOOL_VCC141AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_CC) -c\
+        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -213 +227 @@
 else
  define TOOL_VCC141AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC141AMD64_CXX) -c\
+        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -259 +273 @@
  define TOOL_VCC141AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC141AMD64_CXX) -c -Yc\
+        $(QUIET)$(TOOL_VCC141AMD64_SETUP_ENV)$(TOOL_VCC141AMD64_CXX) -c -Yc\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \