stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8237879: make 4.3 breaks build

Browse Source 
Reviewed-by: erikj, tbell
This commit is contained in:
Magnus Ihse Bursie 2020-01-30 11:08:30 +01:00
parent dfb31205a1
commit af5c725b81
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/common/MakeBase.gmk
View File

@ -525,15 +525,16 @@ DependOnVariableFileName = \
# Param 2 - (optional) name of file to store value in # Param 2 - (optional) name of file to store value in
DependOnVariableHelper = \ DependOnVariableHelper = \
$(strip \ $(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))),,\ $(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), \ $(if $(findstring $(LOG_LEVEL), trace), \
$(info NewVariable $1: >$(strip $($1))<) \ $(info NewVariable $1: >$(strip $($1))<) \
$(info OldVariable $1: >$(strip $($1_old))<)) \ $(info OldVariable $1: >$(strip $($1_old))<)) \
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
$(call DependOnVariableFileName, $1, $2))) \ $($1_filename))) \
$(call DependOnVariableFileName, $1, $2) \ $($1_filename) \
) )
# Main macro # Main macro