From 0853b330042ee9f17a288e19bd0fa1c46ec5b5d1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 8 Jul 2020 03:08:30 -0700 Subject: [PATCH] 8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters Reviewed-by: erikj --- make/common/Modules.gmk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index 9f6dff6cef9..daffb1ed5b7 100644 --- a/make/common/Modules.gmk +++ b/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))