(MINGW_BUILD): generic

detection of mingw build.

diff --git a/ChangeLog b/ChangeLog
index cda08ffeb3c875430426831bb47d77b2461b82af..f4360ebc7f4ac259f63eae7e5dbfb920554f88a2 100644 (file)
--- 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 043eb670e8a5ca43d9d8d308b28e97e5e1864aa9..2e2b86944916623af63e7715b8bdb828e62e1d38 100644 (file)
--- 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