From 53347d96e31de12925d113891ba9f9b42d5275f3 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 12 Sep 2011 16:59:07 +0000
Subject: [PATCH] build: fix a typo in the mingw configuration sequence in
 lol-build and add set -e to the build-mingw scripts to catch possible
 regressions.

---
 build-mingw     | 1 +
 build-mingw64   | 1 +
 build/lol-build | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build-mingw b/build-mingw
index ae76dd5a..59b3196c 100755
--- a/build-mingw
+++ b/build-mingw
@@ -3,6 +3,7 @@
 # This can't hurt
 make distclean
 
+set -e
 ./build/lol-build bootstrap windows-i386
 ./build/lol-build configure windows-i386
 ./build/lol-build build windows-i386
diff --git a/build-mingw64 b/build-mingw64
index 8c45a51d..f23398ae 100755
--- a/build-mingw64
+++ b/build-mingw64
@@ -3,6 +3,7 @@
 # This can't hurt
 make distclean
 
+set -e
 ./build/lol-build bootstrap windows-amd64
 ./build/lol-build configure windows-amd64
 ./build/lol-build build windows-amd64
diff --git a/build/lol-build b/build/lol-build
index 0d367f97..ed6e63f6 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -57,7 +57,7 @@ configure()
     cd $top_srcdir
     case "$platform" in
         windows-i386)
-            if test "x${SYSTEM}" = xMINGW32; then
+            if test "x${MSYSTEM}" = xMINGW32; then
                 :
             elif i586-mingw32msvc-g++ --version >/dev/null 2>&1; then
                 HOSTFLAGS=--host=i586-mingw32msvc
@@ -73,7 +73,7 @@ configure()
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
             ;;
         windows-amd64)
-            if test "x${SYSTEM}" = xMINGW64; then
+            if test "x${MSYSTEM}" = xMINGW64; then
                 :
             elif x86_64-w64-mingw32-g++ --version >/dev/null 2>&1; then
                 HOSTFLAGS=--host=x86_64-w64-mingw32