From: Conley Owens <cco3@android.com>
Date: Thu, 22 Dec 2011 17:46:19 +0000 (-0800)
Subject: Get build system to work with Make 3.82
X-Git-Tag: android-x86-4.4-r1~1120^2~60^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d38c870d2e168b051692b20ade0fc966c9e2daf7;p=android-x86%2Fbuild.git

Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
---

diff --git a/core/definitions.mk b/core/definitions.mk
index 16064aef5..3a5249c15 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -691,7 +691,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 b28b2f791..380fb1d1d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -39,13 +39,15 @@ endif
 
 # check for broken versions of make
 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
 
 TOP := .
 TOPDIR :=