[m-rev.] [PATCH 4/4] Match extended host triplets from MXE project.

[Peter Wang]

The MXE project extends target triplets with dot-separated suffixes on
their unstable branch, e.g. "x86_64-w64-mingw32.static".

configure.ac:
compiler/Mmakefile:
	Relax two pattern matches for the extra suffixes.

	Delete ineffective assignment.
---
 compiler/Mmakefile | 5 ++---
 configure.ac       | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler/Mmakefile b/compiler/Mmakefile
index da266bd..0623f2b 100644
--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -81,12 +81,11 @@ endif
 # The default C stack size of 1Mb on Windows is not enough to compile the
 # standard library in the hlc.gc grade using a Mercury compiler built in
 # the hlc.gc grade with MinGW64.
-# XXX we must match against the full architecture string here since we only
-# want to pass --stack to the linker for MinGW64 GCC.
+# XXX We only want to pass --stack to the linker for MinGW64 GCC.
 # When we support the 64-bit version of the Microsoft toolchain, we will
 # need to do something different here.
 #
-ifeq ($(FULLARCH),x86_64-w64-mingw32)
+ifneq ("$(findstring x86_64-w64-mingw32,$(FULLARCH))","")
 LDFLAGS += -Wl,--stack=8388608
 endif
 
diff --git a/configure.ac b/configure.ac
index 18a5388..57035ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3118,8 +3118,7 @@ case "$host" in
         esac
         ;;
 
-    x86_64*w64*mingw32)
-        THREAD_LIBS=""
+    x86_64*w64*mingw32*)
         CFLAGS_FOR_THREADS="$WIN32_GC_THREADLIB"
         THREAD_LIBS="-lpthread"
         ;;
-- 
1.8.4