Skip to content
Permalink
Browse files

8248701: On Windows generated modules-deps.gmk can contain backslash-…

…r (CR) characters

Reviewed-by: erikj
  • Loading branch information
Andrew Leonard
Andrew Leonard committed Jul 8, 2020
1 parent d308558 commit 0853b330042ee9f17a288e19bd0fa1c46ec5b5d1
Showing with 2 additions and 0 deletions.
  1. +2 −0 make/common/Modules.gmk
@@ -346,6 +346,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
sub(/\/\*.*\*\//, ""); \
gsub(/^ +\*.*/, ""); \
gsub(/ /, ""); \
gsub(/\r/, ""); \
printf(" %s", $$0) } \
END { printf("\n") }' $m && \
$(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
@@ -359,6 +360,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
sub(/\/\*.*\*\//, ""); \
gsub(/^ +\*.*/, ""); \
gsub(/ /, ""); \
gsub(/\r/, ""); \
printf(" %s", $$0) } \
END { printf("\n") }' $m \
) >> $@ $(NEWLINE))

0 comments on commit 0853b33

Please sign in to comment.