Fixed broken libffi Makefile on Win64; Auto selecting GCC_PREFIX for MinGW-w64

diff --git a/default.cf b/default.cf
index 728f1b9..2bf9176 100644 (file)
--- a/default.cf
+++ b/default.cf
@@ -1,5 +1,12 @@
 EC_BINS := $(_CF_DIR)$(if $(USE_BOOTSTRAP),compiler/bootstrap/obj/bin.$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG)/,obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG)/bin/)
 
+ifdef WINDOWS_HOST
+ # Auto-Select MinGW-w64 when asking for 64 bit
+ ifeq "$(ARCH)" "x64"
+  GCC_PREFIX=x86_64-w64-mingw32-
+ endif
+endif
+
 # TOOLCHAIN
 export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
 export CPP     = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)

diff --git a/deps/libffi-3.0.11/Makefile b/deps/libffi-3.0.11/Makefile
index 54b1748..2a62506 100644 (file)
--- a/deps/libffi-3.0.11/Makefile
+++ b/deps/libffi-3.0.11/Makefile
@@ -43,7 +43,7 @@ RES =
 
 TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)/$(LP)ffi$(A)
 
-ifeq "$(HOST_ARCH)" "X64"
+ifeq "$(TARGET_ARCH)" "x86_64"
 PLATFORM_OBJ  := win64
 else
 PLATFORM_OBJ  := win32