From 3b1ab9bd05977a31dd2f4b47b52c5f7d920ade47 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Thu, 12 Jan 2006 23:43:15 +0000
Subject: [PATCH] (MINGW_BUILD): generic detection of mingw build.

---
 ChangeLog                           | 5 +++++
 stepmake/stepmake/generic-vars.make | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cda08ffeb3..f4360ebc7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* stepmake/stepmake/generic-vars.make (MINGW_BUILD): generic
+	detection of mingw build.
+
 2006-01-12  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* stepmake/stepmake/generic-vars.make (MINGW_BUILD): Add
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 043eb670e8..2e2b869449 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -108,14 +108,9 @@ ifeq ($(HOST_ARCH),i686-cygwin)
 CYGWIN_BUILD = yes
 endif
 
-ifeq ($(HOST_ARCH),i586-mingw32msvc)
+ifeq (mingw,$(findstring mingw$(HOST_ARCH)))
 MINGW_BUILD = yes
 endif
-ifeq ($(HOST_ARCH),i386-mingw32)
-MINGW_BUILD = yes
-endif
-ifeq ($(HOST_ARCH),i686-mingw32)
-MINGW_BUILD = yes
 endif
 ifeq (darwin,$(findstring darwin,$(HOST_ARCH)))
 DARWIN_BUILD = yes
-- 
2.39.5