diff options
| author | Raphael <raphael@google.com> | 2011-12-21 15:02:44 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-21 15:02:44 -0800 |
| commit | fe927e18a698b62b48ce4f662a1170de5b1295ac (patch) | |
| tree | 674d053c5cc7c328b14193ad3250bca9095d8bdf | |
| parent | d44d54a0d947de3bda7132ed9216b9685ace92dd (diff) | |
| parent | 76bf62d75e7d4680dac1522534c56f4b511e5cd1 (diff) | |
| download | build-fe927e18a698b62b48ce4f662a1170de5b1295ac.zip build-fe927e18a698b62b48ce4f662a1170de5b1295ac.tar.gz build-fe927e18a698b62b48ce4f662a1170de5b1295ac.tar.bz2 | |
Merge "Allow make 3.82 to be used under Cygwin 1.7"
| -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 939d9d7..cfca47d 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)) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) @@ -46,6 +48,7 @@ $(warning * see http://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif +endif TOP := . TOPDIR := |