Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d38c870d authored by Conley Owens's avatar Conley Owens Committed by Jean-Baptiste Queru
Browse files

Get build system to work with Make 3.82 

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

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
parent 9ce06f11

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -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



###########################################################

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -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 :=