StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d38c870d: Get build system to work with Make 3.82

Browse Source 
* commit 'd38c870d2e168b051692b20ade0fc966c9e2daf7':
  Get build system to work with Make 3.82
This commit is contained in:
Conley Owens
2011-12-22 16:52:42 -08:00
committed by Android Git Automerger
parent 657aeac842 d38c870d2e
commit f3c068db26
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -691,7 +691,7 @@ define _get-package-overrides
endef endef
define get-package-overrides define get-package-overrides
$(strip $(sort $(call _get-package-overrides,$(1)))) $(sort $(strip $(call _get-package-overrides,$(1))))
endef endef
########################################################### ###########################################################

4
core/main.mk
View File

@@ -39,13 +39,15 @@ endif
# check for broken versions of make # 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.81))
ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82))
$(warning ********************************************************************************) $(warning ********************************************************************************)
$(warning * You are using version $(MAKE_VERSION) of make.) $(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 * see http://source.android.com/source/download.html)
$(warning ********************************************************************************) $(warning ********************************************************************************)
$(error stopping) $(error stopping)
endif endif
endif
TOP := . TOP := .
TOPDIR := TOPDIR :=