From 4c456990150dca67ce39b398445d7cfec1f10f3d Mon Sep 17 00:00:00 2001
From: Raphael Moll <ralf@android.com>
Date: Tue, 27 Mar 2012 10:07:42 -0700
Subject: Allow make 3.82 to be used under Cygwin 1.7

(Manual merge of 76bf62d75e7d4680dac1522534c56f4b511e5cd1)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
---
 core/main.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/main.mk')

diff --git a/core/main.mk b/core/main.mk
index 5682643..3d8d6e0 100644
--- 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 :=
-- 
cgit v1.1