diff options
| author | Raphael Moll <ralf@android.com> | 2012-03-27 10:07:42 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2012-03-27 14:35:34 -0700 |
| commit | 4c456990150dca67ce39b398445d7cfec1f10f3d (patch) | |
| tree | 68ab8cda3150c79ba42e792706ba6500cd87744f /core/main.mk | |
| parent | 3b1ebe7dc291175886f21ffbbccdb98b560efabf (diff) | |
| download | build-4c456990150dca67ce39b398445d7cfec1f10f3d.zip build-4c456990150dca67ce39b398445d7cfec1f10f3d.tar.gz build-4c456990150dca67ce39b398445d7cfec1f10f3d.tar.bz2 | |
Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of 76bf62d75e7d4680dac1522534c56f4b511e5cd1)
Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 5 |
1 files changed, 4 insertions, 1 deletions
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 := |