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

This commit is contained in:
Raphael Moll
2012-03-27 16:16:45 -07:00
committed by android code review

View File

@@ -37,7 +37,9 @@ endif
#TOPDIR := $(TOP)/ #TOPDIR := $(TOP)/
#endif #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.81))
ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82)) ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82))
$(warning ********************************************************************************) $(warning ********************************************************************************)
@@ -48,6 +50,7 @@ $(warning **********************************************************************
$(error stopping) $(error stopping)
endif endif
endif endif
endif
TOP := . TOP := .
TOPDIR := TOPDIR :=