From 11115c6ec648166d47a668cf22917919c3657931 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Mon, 22 Jan 2018 22:22:56 -0800 Subject: mingw-w64: harmonize triples, use prebuilt MinGW in BH * BH: Prefer to use the MinGW prebuilt compiler in the Android source tree. * BH: Remove code that searches for a MinGW that predates mingw-w64. * BH: Remove the unusual BH_HOST=amd64-pc-mingw32msvc assignment. The remaining BH_HOST=x86_64-w64-mingw32 appears to be setting the wrong variable; BH_HOST_CONFIG is already set to x86_64-w64-mingw32. * BH: I don't think I've seen a MinGW config where the 64-bit toolchain was accessed by passing -m64 to the 32-bit driver, so remove that bit. If we're searching for MinGW in the PATH, prefer the 32-bit driver. I have seen newer versions of MinGW where passing -m32 to the 64-bit driver doesn't work. (Missing libraries, IIRC.) * Replace i586-pc-mingw32 and i586-pc-mingw32msvc with i686-w64-mingw32. Test: ./checkbuild.py --system=windows Test: ./checkbuild.py --system=windows64 Change-Id: Ia05f0af3b08d6b34365caffcc3eec7a7b90cc595 --- sources/host-tools/make-3.81/build-make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources') diff --git a/sources/host-tools/make-3.81/build-make.sh b/sources/host-tools/make-3.81/build-make.sh index edee4a5fd..12c8dd415 100755 --- a/sources/host-tools/make-3.81/build-make.sh +++ b/sources/host-tools/make-3.81/build-make.sh @@ -79,7 +79,7 @@ BUILD_DIR=$BUILD_DIR/build CONFIGURE_FLAGS="--disable-nls --disable-rpath" if [ "$MINGW" = "yes" ]; then # Required for a proper mingw cross compile - CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --host=i586-pc-mingw32" + CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --host=i686-w64-mingw32" fi if [ "$DARWIN" = "yes" ]; then -- cgit v1.2.3