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

* commit 'b6addfb250606175ca679c8fb6e549cd98eee5b0':
  Allow make 3.82 to be used under Cygwin 1.7
This commit is contained in:
Raphael Moll 2012-03-27 17:55:44 -07:00 committed by Android Git Automerger
commit f515ad2797

View file

@ -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 :=