Use export to simplify windows Makefiles. Fix BIT_IDENTICAL_FLOATING_POINT

build for MSVC Makefiles (have no time to test non-MSVC currently).

Author: eliotmiranda

build.win32x86/common/Makefile

@@ -18,6 +18,7 @@ VM?=Squeak
 VM_NAME?=$(VM)
 CONFIGURATION=product
 THREADING=single
+export VM VM_NAME CONFIGURATION
 
 # Is this a Croquet VM (defaults to OGL instead of D3D)?
 CROQUET:=-DCROQUET
@@ -45,9 +46,11 @@ else
 endif
 $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory
 PLUGINSRCDIR:= ../../src
+export PLUGINSRCDIR
 OBJDIR:= $(BUILD)/vm
 
 PLATDIR:=../../platforms
+export PLATDIR
 CROSSDIR:=$(PLATDIR)/Cross/vm
 TPDIR:=$(PLATDIR)/Cross/third-party
 WIN32DIR:=$(PLATDIR)/win32/vm
@@ -77,6 +80,7 @@ DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS)))
 
 ifdef BIT_IDENTICAL_FLOATING_POINT
 LIBS:=$(BUILD)/fdlibm/libm.a $(LIBS)
+export BIT_IDENTICAL_FLOATING_POINT
 endif
 
 #############################################################################
@@ -275,28 +279,23 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 	rm -f $(BUILD)/vm/$(*F).ignore
 	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
-		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" \
 		$(OBJDIR)/$(*F).lib
+		LIBNAME=$(*F) INTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN=$(*F)" $(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
 $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 	@-mkdir -p $(BUILD)/$(*F)
 	rm -f $(BUILD)/$(*F).ignore
 	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" VMLIB=$(OBJDIR)/$(VMLIB) \
-		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) JMPOBJ=$(JMPOBJ) \
-		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" LIBNAME=$(*F) $(OBJDIR)/$(*F).dll
+		LIBNAME=$(*F) EXTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		JMPOBJ=$(JMPOBJ) VMLIB=$(OBJDIR)/$(VMLIB) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" $(OBJDIR)/$(*F).dll
 
 $(BUILD)/fdlibm/libm.a:
 	@-mkdir -p $(@D)
-	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
+	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
 		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote
 
 

build.win32x86/common/Makefile.lib.extra

@@ -10,12 +10,16 @@ THIRDPARTYDIR?=$(BUILD)/third-party
 THIRDPARTYLIBDIR?=$(THIRDPARTYOUTDIR)/bin
 THIRDPARTYINCLUDEDIR?=$(THIRDPARTYOUTDIR)/include
 THIRDPARTYCACHEDIR?=../../.thirdparty-cache
-THIRDPARTYOUTDIR?=$(abspath $(THIRDPARTYCACHEDIR)/windows/i386)
+THIRDPARTYOUTDIR?=$(abspath $(THIRDPARTYCACHEDIR)/windows/x86_64)
+export THIRDPARTYOUTDIR
 THIRDPARTYINSTALLDIR?=$(BUILD)/vm
-THIRDPARTY_CFLAGS?=-m32 -static-libgcc -static-libstdc++
-THIRDPARTY_LDFLAGS?=-m32 -static-libgcc -static-libstdc++
+THIRDPARTY_CFLAGS?=-m64 -static-libgcc -static-libstdc++
+THIRDPARTY_LDFLAGS?=-m64 -static-libgcc -static-libstdc++
 WGET?=wget -q --no-check-certificate 
 
+#I need this toolchain to compile external libraries with appropriate gcc
+THIRDPARTY_TOOLCHAIN:=CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar LD=x86_64-w64-mingw32-clang NM=x86_64-w64-mingw32-nm RC=x86_64-w64-mingw32-windres DLLTOOL=x86_64-w64-mingw32-dlltool DLLWRAP=x86_64-w64-mingw32-dllwrap
+	
 
 $(THIRDPARTYDIR):
 	if [ ! -d $(THIRDPARTYDIR) ]; then mkdir -p $(THIRDPARTYDIR); fi

build.win32x86/common/Makefile.msvc

@@ -1,5 +1,5 @@
 #############################################################################
-# Common Makefile for Win32 VM using MSVC, e.g. 2017 Community, and gnu make
+# Common Makefile for Win64 VM using MSVC, e.g. 2017 Community, and gnu make
 # Copyright (c) 2020 3D Immersive Collaboration Consulting, LLC
 #
 # Do make init to allow make -n to function.
@@ -20,6 +20,7 @@ VM?=Squeak
 VM_NAME?=$(VM)
 CONFIGURATION=product
 THREADING=single
+export VM VM_NAME CONFIGURATION
 
 # Is this a Croquet VM (defaults to OGL instead of D3D)?
 CROQUET:=-DCROQUET
@@ -47,11 +48,14 @@ else
 endif
 
 PLUGINSRCDIR:= ../../src
+export PLUGINSRCDIR
 OBJDIR:= $(BUILD)/vm
 
 PLATDIR:=../../platforms
+export PLATDIR
 CROSSDIR:=$(PLATDIR)/Cross/vm
 TPDIR:=$(PLATDIR)/Cross/third-party
+export TPDIR
 WIN32DIR:=$(PLATDIR)/win32/vm
 WIN32PLUGINSDIR:=$(PLATDIR)/win32/plugins
 WIN32MISCDIR:=$(PLATDIR)/win32/misc
@@ -88,6 +92,7 @@ DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS)))
 
 ifdef BIT_IDENTICAL_FLOATING_POINT
 LIBS:=$(BUILD)/fdlibm/libm.a $(LIBS)
+export BIT_IDENTICAL_FLOATING_POINT
 endif
 
 #############################################################################
@@ -117,8 +122,8 @@ VMRES:=	$(VM).res
 VMDEFIN:=$(VM).def.in
 BTOBJ:= $(OBJDIR)/btext.o
 ETOBJ:= $(OBJDIR)/etext.o
-JMPASM:=_setjmp-x86.asm
-JMPOBJ:=$(OBJDIR)/_setjmp-x86.o
+JMPASM:=_setjmp-x64.asm
+JMPOBJ:=$(OBJDIR)/_setjmp-x64.o
 
 .PRECIOUS: mkNamedPrims.exe
 
@@ -223,13 +228,11 @@ $(VMEXE): $(OBJDIR) $(THIRDPARTYLIBS) $(VMOBJ) $(LIBS) resource.o $(BTOBJ) $(ETO
 	$(CC) $(DASH_O)$(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -D'TZ="$(TZ)"' -c $(WIN32DIR)/version.c
 	$(LD) $(LDFLAGS) -OUT:$(VMEXE) -MAP:$(VMMAP) \
 			$(BTOBJ) $(VMOBJ) $(JMPOBJ) $(OBJDIR)/resource.o $(filter-out $(call ignore), $(LIBS)) $(STDLIBS) $(ETOBJ)
-	$(NM) --numeric-sort --defined-only -f bsd $(VMEXE) >$(VMMAP).bsd
 
 $(CONSOLEVMEXE): $(VMOBJ) $(LIBS) resource.o $(BTOBJ) $(ETOBJ) $(JMPOBJ)
 	$(CC) $(DASH_O)$(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -D'TZ="$(TZ)"' -c $(WIN32DIR)/version.c
 	$(LD) $(CONSOLELDFLAGS) -OUT:$(CONSOLEVMEXE) -MAP:$(CONSOLEVMMAP) \
 			$(BTOBJ) $(VMOBJ) $(JMPOBJ) $(OBJDIR)/resource.o $(filter-out $(call ignore), $(LIBS)) $(STDLIBS) $(ETOBJ)
-	$(NM) --numeric-sort --defined-only -f bsd $(CONSOLEVMEXE) >$(CONSOLEVMMAP).bsd
 
 $(OBJDIR):
 	@-$(MKDIR) $(BUILD)
@@ -262,23 +265,18 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 	$(RM) -f $(BUILD)/vm/$(*F).ignore
 	$(MAKE) $(MFLAGS) $(SUBMFLAGS) -I../common BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" INTERNAL_PLUGIN=1 TPDIR=$(TPDIR) \
-		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
-		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN=$(*F)" LIBNAME=$(*F) $(OBJDIR)/$(*F).lib
+		LIBNAME=$(*F) INTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN=$(*F)" $(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
 $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 	@-$(MKDIR) $(BUILD)/$(*F)
 	$(RM) -f $(BUILD)/$(*F).ignore
 	$(MAKE) $(MFLAGS) $(SUBMFLAGS) -I../common BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" EXTERNAL_PLUGIN=1 TPDIR=$(TPDIR) \
-		CONFIGURATION=$(CONFIGURATION) ARCH=$(ARCH) TOOLPREFIX=$(TOOLPREFIX) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) JMPOBJ=$(JMPOBJ) \
-		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" LIBNAME=$(*F) VMLIB=$(VMLIB) $(OBJDIR)/$(*F).dll
+		LIBNAME=$(*F) EXTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		JMPOBJ=$(JMPOBJ) VMLIB=$(VMLIB) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" $(OBJDIR)/$(*F).dll
 
 $(BUILD)/fdlibm/libm.a:
 	@-mkdir -p $(@D)
@@ -297,7 +295,7 @@ $(VMRES): $(VM).rc
 	$(CP) $(VM).exe.manifest $(OBJDIR)/$(VM)Console.exe.manifest
 
 resource.o:	$(VMRES)
-	$(CVTRES) /MACHINE:X86 /OUT:$(OBJDIR)/resource.o $(OBJDIR)/$(VMRES)
+	$(CVTRES) /MACHINE:$(ARCH) /OUT:$(OBJDIR)/resource.o $(OBJDIR)/$(VMRES)
 
 #############################################################################
 # Extra specific dependencies

build.win32x86/common/Makefile.msvc.flags

@@ -7,6 +7,7 @@
 #############################################################################
 
 ARCH:=x86
+export ARCH
 
 # Find out where the MSVC tools are if not already defined.
 ifeq ($(VCToolsInstallDir),)
@@ -39,6 +40,7 @@ $(info VCINSTALLDIRSH=$(VCINSTALLDIRSH))
 $(info wildcard  C:/Program\ Files/LLVM/bin/.* $(wildcard C:/Program\ Files/LLVM/bin/.*))
 
 override TOOLPREFIX:="$(VCToolsInstallDir)bin/HostX64/x86/"
+export TOOLPREFIX
 MSVC:=MSVC
 undefine Clang
 undefine ClangC2

build.win32x86/common/Makefile.msvc.plugin

@@ -31,6 +31,7 @@ BUILDDIR:=	$(BUILD)/$(LIBNAME)
 # Support directory locations
 CROSSVMDIR:= $(PLATDIR)/Cross/vm
 WIN32VMDIR:= $(PLATDIR)/win32/vm
+WIN32MISCDIR:=$(PLATDIR)/win32/misc
 MAKERVMDIR:= $(SRCDIR)/vm
 
 #############################################################################
@@ -72,6 +73,9 @@ PLUGINDLL:= $(VMDIR)/$(LIBNAME).dll
 LIBOBJ?=    $(LIBSRC:.c=.o)
 LIBOBJ:=    $(LIBOBJ:.cpp=.o)
 LIBOBJ:=    $(addprefix $(OBJDIR)/,$(LIBOBJ))
+ifdef BIT_IDENTICAL_FLOATING_POINT
+LIBOBJ+=$(BUILD)/fdlibm/libm.a $(LIBS)
+endif
 #$(info LIBOBJ is $(LIBOBJ))
 
 include ../common/Makefile.msvc.flags
@@ -92,6 +96,7 @@ print-settings:
 	$(info SRCDIR='$(SRCDIR)')
 	$(info CROSSDIR='$(CROSSDIR)')
 	$(info WIN32DIR='$(WIN32DIR)')
+	$(info WIN32MISCDIR='$(WIN32MISCDIR)')
 	$(info MAKERDIR='$(MAKERDIR)')
 	$(info CROSSSRC='$(CROSSSRC)')
 	$(info WIN32SRC='$(WIN32SRC)')
@@ -105,6 +110,7 @@ print-settings:
 	$(info PLUGINSRCDIR='$(PLUGINSRCDIR)')
 	$(info PLUGINLIB='$(PLUGINLIB)')
 	$(info PLUGINDLL='$(PLUGINDLL)')
+	$(info PLUGINDLL_LIBS='$(PLUGINDLL_LIBS)')
 	$(info XINC='$(XINC)')
 	$(info XDEFS='$(XDEFS)')
 	$(info -----------------------------------------------------)
@@ -119,8 +125,10 @@ $(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) $(LIBSRC)
 	-$(RM) $(PLUGINLIB)
 	$(LIBRARIAN) $(LIBOBJ) $(EXTRALIBS) -out:$(subst /,\\,$(PLUGINLIB))
 
+PLUGINDLL_LIBS:=WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib /NODEFAULTLIB:libc /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt
+
 $(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ) $(JMPOBJ) $(LIBSRC)
-	$(LD) WinMM.lib ole32.lib dsound.lib msdmo.lib kernel32.lib $(VMLIB) $(LDFLAGS) -DLL $(LIBOBJ) $(JMPOBJ) $(EXTRALIBS) \
+	$(LD) $(VMLIB) $(LDFLAGS) -DLL $(LIBOBJ) $(JMPOBJ) $(PLUGINDLL_LIBS) $(EXTRALIBS) \
 	-LIBPATH:$(BUILD)/vm \
 	-LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/um/x86" \
 	-LIBPATH:"$(WindowsSdkDir)LIB/$(WindowsSDKVersion)/ucrt/x86" \

build.win32x86/common/Makefile.msvc.tools

@@ -88,7 +88,10 @@ CONSOLELDFLAGS:= /subsystem:console $(BASELDFLAGS)
 DL:=/DEFAULTLIB:
 NDL:=/NODEFAULTLIB:
 
-STDLIBS:=$(STDLIBS) $(NDL)libc $(NDL)libcmt $(DL)msvcrt \
+ifdef BIT_IDENTICAL_FLOATING_POINT
+EXTRANDLS:=/NODEFAULTLIB:libm
+endif
+STDLIBS:=$(STDLIBS) $(NDL)libc $(NDL)libcmt $(EXTRANDLS) $(DL)msvcrt \
          dinput8.lib dsound.lib ws2_32.lib comdlg32.lib ole32.lib winmm.lib \
          version.lib wininet.lib user32.lib gdi32.lib psapi.lib \
          advapi32.lib kernel32.lib secur32.lib shell32.lib shfolder.lib

build.win32x86/common/Makefile.plugin

@@ -98,6 +98,9 @@ PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib
 PLUGINDLL:= $(VMDIR)/$(LIBNAME).dll
 LIBOBJ ?= 	$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(LIBSRC)))		 
 LIBOBJ:=    $(addprefix $(OBJDIR)/,$(LIBOBJ))
+ifdef BIT_IDENTICAL_FLOATING_POINT
+LIBOBJ+=$(BUILD)/fdlibm/libm.a $(LIBS)
+endif
 
 
 VPATH:= $(MAKERDIR) $(WIN32DIR) $(CROSSDIR) $(OBJDIR)

build.win32x86/common/Makefile.tools

@@ -3,6 +3,7 @@
 #
 
 TOOLPREFIX:=i686-w64-mingw32-
+export TOOLPREFIX
 
 #############################################################################
 # C compiler settings (gcc 4.x)

build.win64x64/common/Makefile

@@ -18,6 +18,7 @@ VM?=Squeak
 VM_NAME?=$(VM)
 CONFIGURATION=product
 THREADING=single
+export VM VM_NAME CONFIGURATION
 
 # Is this a Croquet VM (defaults to OGL instead of D3D)?
 CROQUET:=-DCROQUET
@@ -45,9 +46,11 @@ else
 endif
 $(shell mkdir -p deps >/dev/null) # deps is the dependencies directory
 PLUGINSRCDIR:= ../../src
+export PLUGINSRCDIR
 OBJDIR:= $(BUILD)/vm
 
 PLATDIR:=../../platforms
+export PLATDIR
 CROSSDIR:=$(PLATDIR)/Cross/vm
 TPDIR:=$(PLATDIR)/Cross/third-party
 WIN32DIR:=$(PLATDIR)/win32/vm
@@ -77,6 +80,7 @@ DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS)))
 
 ifdef BIT_IDENTICAL_FLOATING_POINT
 LIBS:=$(BUILD)/fdlibm/libm.a $(LIBS)
+export BIT_IDENTICAL_FLOATING_POINT
 endif
 
 #############################################################################
@@ -275,28 +279,23 @@ $(OBJDIR)/%.lib: $(call plugin-makefile,$(*F))
 	rm -f $(BUILD)/vm/$(*F).ignore
 	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" \
-		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		LIBNAME=$(*F) COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN" \
 		$(OBJDIR)/$(*F).lib
+		LIBNAME=$(*F) INTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_BUILTIN_PLUGIN=$(*F)" $(OBJDIR)/$(*F).lib
 
 # External plugin.  Build as dll and copy to vm dir ($(OBJDIR)).
 $(OBJDIR)/%.dll: $(call plugin-makefile,$(*F))
 	@-mkdir -p $(BUILD)/$(*F)
 	rm -f $(BUILD)/$(*F).ignore
 	$(MAKE) $(MFLAGS) BUILD=$(BUILD) \
 		-f $(call plugin-makefile,$(*F)) \
-		"VM=$(VM)" "VM_NAME=$(VM_NAME)" VMLIB=$(OBJDIR)/$(VMLIB) \
-		CONFIGURATION=$(CONFIGURATION) TOOLPREFIX=$(TOOLPREFIX) \
-		PLATDIR=$(PLATDIR) PLUGINSRCDIR=$(PLUGINSRCDIR) VMSRCDIR=$(VMSRCDIR) \
-		THIRDPARTYOUTDIR=$(THIRDPARTYOUTDIR) JMPOBJ=$(JMPOBJ) \
-		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" LIBNAME=$(*F) $(OBJDIR)/$(*F).dll
+		LIBNAME=$(*F) EXTERNAL_PLUGIN=1 VMSRCDIR=$(VMSRCDIR) \
+		JMPOBJ=$(JMPOBJ) VMLIB=$(OBJDIR)/$(VMLIB) \
+		COGDEFS="$(COGDEFS) -DSQUEAK_EXTERNAL_PLUGIN=$(*F)" $(OBJDIR)/$(*F).dll
 
 $(BUILD)/fdlibm/libm.a:
 	@-mkdir -p $(@D)
-	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
+	$(MAKE) CC='$(CC)' CFLAGS="$(CFLAGS) -D_IEEE_LIBM" -C $(@D) \
 		TP=../../$(TPDIR) -f ../../$(TPDIR)/fdlibm/Makefile.remote
 
 

build.win64x64/common/Makefile.lib.extra

@@ -11,6 +11,7 @@ THIRDPARTYLIBDIR?=$(THIRDPARTYOUTDIR)/bin
 THIRDPARTYINCLUDEDIR?=$(THIRDPARTYOUTDIR)/include
 THIRDPARTYCACHEDIR?=../../.thirdparty-cache
 THIRDPARTYOUTDIR?=$(abspath $(THIRDPARTYCACHEDIR)/windows/x86_64)
+export THIRDPARTYOUTDIR
 THIRDPARTYINSTALLDIR?=$(BUILD)/vm
 THIRDPARTY_CFLAGS?=-m64 -static-libgcc -static-libstdc++
 THIRDPARTY_LDFLAGS?=-m64 -static-libgcc -static-libstdc++