[MLton-commit] r7118

[Matthew Fluet]

Simplify Makefile logic.
----------------------------------------------------------------------

U   mlton/trunk/mlton/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2009-06-11 03:23:12 UTC (rev 7117)
+++ mlton/trunk/mlton/Makefile	2009-06-11 03:23:14 UTC (rev 7118)
@@ -27,21 +27,17 @@
   FLAGS += -default-ann 'warnUnused true'
   # FLAGS += -type-check true
 else
-ifeq (cygwin, $(HOST_OS))
-  # The stubs don't work on Cygwin, since they define spawn in terms of
-  # fork, and fork doesn't work on Cygwin.  So, make without the stubs.
+ifneq (,$(findstring $(HOST_OS), cygwin mingw))
+  # The stubs don't work on Cygwin or MinGW, since they define spawn
+  # in terms of fork, and fork doesn't work on Cygwin or MinGW.  So,
+  # make without the stubs.
   FILE := mlton.cm
 else
-ifeq (mingw, $(HOST_OS))
-  # Ditto for MinGW.
-  FILE := mlton.cm
-else
   # We're compiling MLton with an older version of itself, so use the stubs for
   # the MLton structure.
   FILE := mlton-stubs.cm
 endif
 endif
-endif
 
 FLAGS += -target $(TARGET)
 FLAGS += -verbose 2 -output "$(AOUT)"