am a8dd58a: Merge "Allow make 3.82 to be used under Cygwin 1.7"

* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0': Allow make 3.82 to be used under Cygwin 1.7
mozilla-b2g · Mar 28, 2012 · b6addfb · b6addfb
2 parents 2696eb6 + a8dd58a
commit b6addfb
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 :=