diff options
| author | Conley Owens <cco3@android.com> | 2011-12-22 09:46:19 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-12-22 15:16:05 -0800 |
| commit | d38c870d2e168b051692b20ade0fc966c9e2daf7 (patch) | |
| tree | c477e649d5c78a784fac4c218f5ec0cfc5b0d0bb | |
| parent | 9ce06f11d69f5154843c234fe0624f9e70d39359 (diff) | |
| download | build-d38c870d2e168b051692b20ade0fc966c9e2daf7.zip build-d38c870d2e168b051692b20ade0fc966c9e2daf7.tar.gz build-d38c870d2e168b051692b20ade0fc966c9e2daf7.tar.bz2 | |
Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.
Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
| -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 16064ae..3a5249c 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 b28b2f7..380fb1d 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 := |