35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
|
||
|
|
# HG changeset patch
|
||
|
|
# User ihse
|
||
|
|
# Date 1580378910 -3600
|
||
|
|
# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
|
||
|
|
# Parent 24b4c763cb2276db073bec263246879eb312daeb
|
||
|
|
8237879: make 4.3 breaks build
|
||
|
|
Reviewed-by: erikj, tbell
|
||
|
|
|
||
|
|
diff -r 24b4c763cb22 -r 0743e1d49930 make/common/MakeBase.gmk
|
||
|
|
--- a/make/common/MakeBase.gmk Thu Jan 30 10:10:48 2020 +0100
|
||
|
|
+++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100
|
||
|
|
@@ -525,15 +525,16 @@
|
||
|
|
# Param 2 - (optional) name of file to store value in
|
||
|
|
DependOnVariableHelper = \
|
||
|
|
$(strip \
|
||
|
|
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
|
||
|
|
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
|
||
|
|
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
|
||
|
|
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
|
||
|
|
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
|
||
|
|
+ $(call MakeDir, $(dir $($1_filename))) \
|
||
|
|
$(if $(findstring $(LOG_LEVEL), trace), \
|
||
|
|
$(info NewVariable $1: >$(strip $($1))<) \
|
||
|
|
$(info OldVariable $1: >$(strip $($1_old))<)) \
|
||
|
|
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
|
||
|
|
- $(call DependOnVariableFileName, $1, $2))) \
|
||
|
|
- $(call DependOnVariableFileName, $1, $2) \
|
||
|
|
+ $($1_filename))) \
|
||
|
|
+ $($1_filename) \
|
||
|
|
)
|
||
|
|
|
||
|
|
# Main macro
|
||
|
|
|