diff options
| author | Conley Owens <cco3@android.com> | 2011-12-22 15:14:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-22 15:14:01 -0800 |
| commit | 015c7885e05019b615b0533a599e3ff003c68623 (patch) | |
| tree | 421ac60e367ab5d4a45e2851e8816f0316d6027e | |
| parent | 4630c321892c252ad25f6035cf93b90de22c4f84 (diff) | |
| parent | d7a1a9b49b9d6e8331bcc5b2ece84903a94553de (diff) | |
| download | build-015c7885e05019b615b0533a599e3ff003c68623.zip build-015c7885e05019b615b0533a599e3ff003c68623.tar.gz build-015c7885e05019b615b0533a599e3ff003c68623.tar.bz2 | |
Merge "Get build system to work with Make 3.82"
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 9ae940d..fa0705c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -694,7 +694,7 @@ define _get-package-overrides endef define get-package-overrides -$(strip $(sort $(call _get-package-overrides,$(1)))) +$(sort $(strip $(call _get-package-overrides,$(1)))) endef ########################################################### diff --git a/core/main.mk b/core/main.mk index cfca47d..140e896 100644 --- a/core/main.mk +++ b/core/main.mk @@ -41,14 +41,16 @@ endif # (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 ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) -$(warning * Android can only be built by version 3.81.) +$(warning * Android can only be built by versions 3.81 and 3.82.) $(warning * see http://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif endif +endif TOP := . TOPDIR := |