diff --git a/core/definitions.mk b/core/definitions.mk index 16064aef59..3a5249c158 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 b28b2f791d..380fb1d1dc 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 :=