[rebase]: mk: use host tools instead for make install

Author: alexcrichton

Diff for: mk/cfg/x86_64-pc-windows-msvc.mk

@@ -26,8 +26,12 @@ CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-win32
 # These two environment variables are scraped by the `./configure` script and
 # are necessary for `cl.exe` to find standard headers (the INCLUDE variable) and
 # for `link.exe` to find standard libraries (the LIB variable).
+ifdef CFG_MSVC_INCLUDE_PATH
 export INCLUDE := $(CFG_MSVC_INCLUDE_PATH)
+endif
+ifdef CFG_MSVC_LIB_PATH
 export LIB := $(CFG_MSVC_LIB_PATH)
+endif
 
 # Unfortunately `link.exe` is also a program in `/usr/bin` on MinGW installs,
 # but it's not the one that we want. As a result we make sure that our detected

Diff for: mk/prepare.mk

@@ -122,8 +122,8 @@ define DEF_PREPARE_TARGET_N
 # Rebind PREPARE_*_LIB_DIR to point to rustlib, then install the libs for the targets
 prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)/rustlib/$(2)/lib
 prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(2)/lib
-prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_LIB_DIR)/rustlib/$(2)/bin
-prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(2)/bin
+prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_SOURCE_BIN_DIR=$$(PREPARE_SOURCE_LIB_DIR)/rustlib/$(3)/bin
+prepare-target-$(2)-host-$(3)-$(1)-$(4): PREPARE_DEST_BIN_DIR=$$(PREPARE_DEST_LIB_DIR)/rustlib/$(3)/bin
 prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
         $$(foreach crate,$$(TARGET_CRATES), \
           $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(crate)) \
@@ -148,7 +148,7 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
               $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))),) \
 	  $$(foreach object,$$(INSTALLED_OBJECTS_$(2)),\
 	    $$(call PREPARE_LIB,$$(object))) \
-	  $$(foreach bin,$$(INSTALLED_BINS_$(2)),\
+	  $$(foreach bin,$$(INSTALLED_BINS_$(3)),\
 	    $$(call PREPARE_BIN,$$(bin))) \
 	,),),)
 endef