]>
Commit | Line | Data |
---|---|---|
2692550d JP |
1 | |
2 | # HG changeset patch | |
3 | # User ihse | |
4 | # Date 1580378910 -3600 | |
5 | # Node ID 0a3f080b7f94e194efd98e45a11ac847d5b3291a | |
6 | # Parent f6ebf6148ff0ca648ea0574469091d481dd965d0 | |
7 | 8237879: make 4.3 breaks build | |
8 | Reviewed-by: erikj, tbell | |
9 | ||
10 | diff -r f6ebf6148ff0 -r 0a3f080b7f94 make/common/MakeBase.gmk | |
11 | --- a/make/common/MakeBase.gmk Mon Feb 03 09:39:39 2020 +0100 | |
12 | +++ b/make/common/MakeBase.gmk Thu Jan 30 11:08:30 2020 +0100 | |
13 | @@ -1036,15 +1036,16 @@ | |
14 | # Param 2 - (optional) name of file to store value in | |
15 | DependOnVariableHelper = \ | |
16 | $(strip \ | |
17 | - $(eval -include $(call DependOnVariableFileName, $1, $2)) \ | |
18 | + $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \ | |
19 | + $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \ | |
20 | $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ | |
21 | - $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ | |
22 | + $(call MakeDir, $(dir $($1_filename))) \ | |
23 | $(if $(findstring $(LOG_LEVEL), trace), \ | |
24 | $(info NewVariable $1: >$(strip $($1))<) \ | |
25 | $(info OldVariable $1: >$(strip $($1_old))<)) \ | |
26 | $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ | |
27 | - $(call DependOnVariableFileName, $1, $2))) \ | |
28 | - $(call DependOnVariableFileName, $1, $2) \ | |
29 | + $($1_filename))) \ | |
30 | + $($1_filename) \ | |
31 | ) | |
32 | ||
33 | # Main macro | |
34 |