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

…r (CR) characters Backport-of: 0853b33
openjdk · May 10, 2023 · 1f49004 · 1f49004 · openjdk-notifier · May 10, 2023
1 parent 7b2d5fc
commit 1f49004
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
@@ -337,6 +337,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
 	                          sub(/\/\*.*\*\//, ""); \
 	                          gsub(/^ +\*.*/, ""); \
 	                          gsub(/ /, ""); \
+                                  gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m && \
 	      $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \
@@ -350,6 +351,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
 	                          sub(/\/\*.*\*\//, ""); \
 	                          gsub(/^ +\*.*/, ""); \
 	                          gsub(/ /, ""); \
+                                  gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m \
 	    ) >> $@ $(NEWLINE))