am d38c870d: Get build system to work with Make 3.82
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
Get build system to work with Make 3.82
diff --git a/core/definitions.mk b/core/definitions.mk
index 16064ae..3a5249c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -691,7 +691,7 @@
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 b28b2f7..380fb1d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -39,13 +39,15 @@
# 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 :=
