openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Get build system to work with Make 3.82"

This commit is contained in:
Conley Owens 2011-12-22 15:14:01 -08:00 committed by Android (Google) Code Review
parent 4630c32189 d7a1a9b49b
commit 015c7885e0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@ -694,7 +694,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
###########################################################

4
core/main.mk
View File

@ -41,14 +41,16 @@ endif
# (Allow any version under Cygwin since we don't actually build the platform there.)
ifeq (,$(findstring CYGWIN,$(shell uname -sm)))
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
endif
TOP := .
TOPDIR :=