Merge "Allow make 3.82 to be used under Cygwin 1.7"

mozilla-b2g · Mar 27, 2012 · a8dd58a · a8dd58a
2 parents 3b1ebe7 + 4c45699
commit a8dd58a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/main.mk b/core/main.mk
@@ -37,7 +37,9 @@ endif
 #TOPDIR := $(TOP)/
 #endif
 
-# check for broken versions of make
+# Check for broken versions of make.
+# (Allow any version under Cygwin since we don't actually build the platform there.)
+ifeq (,$(findstring CYGWIN,$(shell uname -sm)))
 ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81))
 ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82))
 $(warning ********************************************************************************)
@@ -48,6 +50,7 @@ $(warning **********************************************************************
 $(error stopping)
 endif
 endif
+endif
 
 TOP := .
 TOPDIR :=