Changeset 3036 for trunk/kBuild/tools/VCC120AMD64.kmk

Timestamp:

May 9, 2017, 5:59:50 PM (8 years ago)

Author:

bird

Message:

VCC120AMD64.kmk,VCC120X86.kmk: When using the cross compiling binaries, we need to point the PATH the directory with the native binaries so DLLs and EXEs can be found (linker mostly). Don't want to require them to be copied around to each dir extra. kmk_redirect should make this rather cheap.

File:

• trunk/kBuild/tools/VCC120AMD64.kmk (modified) (9 diffs)

trunk/kBuild/tools/VCC120AMD64.kmk

@@ -59 +59 @@
 PATH_TOOL_VCC120AMD64_BIN ?= $(PATH_TOOL_VCC120AMD64)/bin/amd64
 else
+PATH_TOOL_VCC120AMD64_BIN_DLL ?= $(PATH_TOOL_VCC120AMD64)/bin
 PATH_TOOL_VCC120AMD64_BIN ?= $(PATH_TOOL_VCC120AMD64)/bin/x86_amd64
 endif
@@ -87 +88 @@
   endif
  endif
+else ifdef PATH_TOOL_VCC120AMD64_BIN_DLL
+ TOOL_VCC120AMD64_KSUBMIT_DD  = $(REDIRECT) -E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)' --
 endif
 
@@ -163 +166 @@
  define TOOL_VCC120AMD64_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                $(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL),-E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)',)\
                 -- $(TOOL_VCC120AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -171 +175 @@
 else
  define TOOL_VCC120AMD64_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_VCC120AMD64_CC) -c\
+        $(QUIET)$(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL)\
+                ,$(REDIRECT) -E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)' -- ,)$(TOOL_VCC120AMD64_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Fd$(outbase)-obj.pdb \
@@ -203 +208 @@
  define TOOL_VCC120AMD64_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) -P $(DEP_OBJ_INT) -f -s -q -o $(dep) -t $(obj) $(obj)\
+                $(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL),-E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)',)\
                 -- $(TOOL_VCC120AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -213 +219 @@
 else
  define TOOL_VCC120AMD64_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_VCC120AMD64_CXX) -c\
+        $(QUIET)$(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL)\
+                ,$(REDIRECT) -E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)' -- ,)$(TOOL_VCC120AMD64_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 $(if-expr defined($(target)_PCH_HDR)\
@@ -248 +255 @@
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
         $(QUIET)$(TOOL_VCC120AMD64_KSUBMIT) --no-pch-caching -P $(DEP_OBJ_INT) -f -s -q -e .pch -o $(dep) -t $(obj) $(obj)\
+                $(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL),-E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)',)\
                 -- $(TOOL_VCC120AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
@@ -259 +267 @@
  define TOOL_VCC120AMD64-PCH_COMPILE_CXX_CMDS
         $(QUIET)$(RM) -f -- $($(target)_1_VCC_PCH_FILE) $($(target)_1_VCC_COMMON_OBJ_PDB)
-        $(QUIET)$(TOOL_VCC120AMD64_CXX) -c -Yc\
+        $(QUIET)$(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL)\
+                ,$(REDIRECT) -E 'PATH=$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)' -- ,)$(TOOL_VCC120AMD64_CXX) -c -Yc\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                -Fp$($(target)_1_VCC_PCH_FILE) \
@@ -290 +299 @@
 TOOL_VCC120AMD64_COMPILE_RC_DEPORD =
 TOOL_VCC120AMD64_COMPILE_RC_OUTPUT =
+## @todo Fix kmk_redirect so we can use it for setting PATH without spawning a shell or two
 define TOOL_VCC120AMD64_COMPILE_RC_CMDS
-        $(QUIET)$(TOOL_VCC120AMD64_RC) \
+        $(QUIET)$(if-expr defined(PATH_TOOL_VCC120AMD64_BIN_DLL)\
+                ,PATH='$(PATH_TOOL_VCC120AMD64_BIN_DLL)$(HOST_PATH_SEP)$(PATH)',)$(TOOL_VCC120AMD64_RC) \
                 $(flags) $(addprefix /i, $(subst /,\\,$(incs))) $(addprefix /d, $(defs))\
                 /fo$(obj)\