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

build: Load makefiles in the same order with Make 4.0

Browse Source 
Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.

This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.

Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
This commit is contained in:
Dan Willemsen
2015-08-06 15:01:24 -07:00
parent d86f39cab7
commit ec224d5072
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/definitions.mk
View File

@@ -139,7 +139,7 @@ endef
###########################################################
define all-makefiles-under
$(wildcard $(1)/*/Android.mk)
$(sort $(wildcard $(1)/*/Android.mk))
endef
###########################################################
@@ -171,7 +171,7 @@ endef
# $(1): List of directories to look for under this directory
define all-named-subdir-makefiles
$(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
$(sort $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1)))))
endef
###########################################################