8201222: JDK-8199539 broke the OpenJDK build

Reviewed-by: darcy
This commit is contained in:
Erik Joelsson 2018-04-06 02:52:24 +02:00
parent 095c5b7a1f
commit f9e5a41e1a

View File

@ -73,11 +73,12 @@ endif
# EXCLUDES : List of filenames to exclude from copy
SetupCopyLegalFiles = $(NamedParamsMacroTemplate)
define SetupCopyLegalFilesBody
$$(eval $$(call SetupCopyFiles, $1, \
SRC := $$(CUSTOM_ROOT), \
DEST := $$(LEGAL_DST_DIR), \
FILES := $$(filter-out $$(addprefix %/, $$($1_EXCLUDES)), \
$$(wildcard $$(addsuffix /*, $$(call FindModuleLegalSrcDirs, $$(MODULE))))), \
FLATTEN := true, \
))
$$(foreach f, $$(filter-out $$(addprefix %/, $$($1_EXCLUDES)), \
$$(wildcard $$(addsuffix /*, $$(call FindModuleLegalSrcDirs, $$(MODULE))))), \
$$(eval $$(call SetupCopyFiles, $1_$$(notdir $$f), \
DEST := $$(LEGAL_DST_DIR), \
FILES := $$f, \
)) \
$$(eval $1 += $$($1_$$(notdir $$f))) \
)
endef