Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Commit

Permalink
Allow make 3.82 to be used under Cygwin 1.7
Browse files Browse the repository at this point in the history 
(Manual merge of 76bf62d)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
  • Loading branch information
@ralf-at-android
ralf-at-android committed Mar 27, 2012
1 parent 3b1ebe7 commit 4c45699
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion core/main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ********************************************************************************)
Expand All @@ -48,6 +50,7 @@ $(warning **********************************************************************
$(error stopping)
endif
endif
endif

TOP := .
TOPDIR :=
Expand Down

0 comments on commit 4c45699

Please sign in to comment.