Get compilation of the 32-bit VM to work on 64-bits under msvc (mkNam…

…edPrims.exe

must be an x64 executable).

building/win32x86/common/Makefile.msvc

@@ -213,8 +213,8 @@ print-objects:
 ignore := $(addsuffix .%, $(basename $(wildcard $(BUILD)/vm/*.ignore)))
 
 mkNamedPrims.exe: $(WIN32UTILDIR)/mkNamedPrims.c
-	$(CC) -c $< -o mkNamedPrims.obj
-	$(LD) /out:$@ mkNamedPrims.obj /subsystem:console /defaultlib:libcmt
+	$(HOSTCC) -c $< -o mkNamedPrims.obj
+	$(HOSTLD) /out:$@ mkNamedPrims.obj /subsystem:console /defaultlib:libcmt
 
 $(BTOBJ):	$(WIN32MISCDIR)/btext.c
 	$(CC) -c $< -Oy -Os $(DASH_O)$@

building/win32x86/common/Makefile.msvc.flags

@@ -39,12 +39,14 @@ $(info VCINSTALLDIRSH=$(VCINSTALLDIRSH))
 #$(info wildcard VCINSTALLDIR $(wildcard $(VCINSTALLDIR)/.*))
 $(info wildcard  C:/Program\ Files/LLVM/bin/.* $(wildcard C:/Program\ Files/LLVM/bin/.*))
 
-override TOOLPREFIX:="$(VCToolsInstallDir)bin/HostX64/x86/"
-export TOOLPREFIX
+override TOOLPREFIX:="$(VCToolsInstallDir)bin/Hostx64/x86/"
+override HOSTTOOLPREFIX:="$(VCToolsInstallDir)bin/Hostx64/x64/"
+export TOOLPREFIX HOSTTOOLPREFIX
 MSVC:=MSVC
 undefine Clang
 undefine ClangC2
 CC:=$(TOOLPREFIX)cl.exe -nologo
+HOSTCC:=$(HOSTTOOLPREFIX)cl.exe -nologo
 
 $(info CC=$(CC))
 

building/win32x86/common/Makefile.msvc.tools

@@ -71,6 +71,7 @@ DEFS:=	$(COGDEFS) $(MEMACCESS) $(WINVER) \
 # Linker settings
 #
 LD:=	LINK /nologo /MACHINE:$(MACHINE) /INCREMENTAL:NO
+HOSTLD:=LINK /nologo /INCREMENTAL:NO
 LDCXX:=	LINK /nologo /MACHINE:$(MACHINE) /INCREMENTAL:NO
 LIBRARIAN:=LIB /nologo
 # dlltool is used to create import libraries.  The alternatives are