Merge "Allow make 3.82 to be used under Cygwin 1.7" (a8dd58a8) · Commits · e / os / android_build

core/main.mk

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 :=