From d7a1a9b49b9d6e8331bcc5b2ece84903a94553de Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Thu, 22 Dec 2011 09:46:19 -0800 Subject: Get build system to work with Make 3.82 Note: `sort` can't seem to handle newlines in 3.82. Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943 --- core/definitions.mk | 2 +- core/main.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 99e38d5..6b49121 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 := -- cgit v1.1