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

Get build system to work with Make 3.82

Browse Source 
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
This commit is contained in:
Conley Owens
2011-12-22 09:46:19 -08:00
parent fe927e18a6
commit d7a1a9b49b
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

@@ -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 :=