OpenJDK / jdk / jdk
changeset 60096:b8bbebdc23c7
8248701: On Windows generated modules-deps.gmk can contain backslash-r (CR) characters
Reviewed-by: erikj
| author | aleonard |
|---|---|
| date | Wed, 08 Jul 2020 03:08:30 -0700 |
| parents | ed375ae6c779 |
| children | 143e258f64af |
| files | make/common/Modules.gmk |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/Modules.gmk Wed Jul 08 15:16:47 2020 +0100 +++ b/make/common/Modules.gmk Wed Jul 08 03:08:30 2020 -0700 @@ -346,6 +346,7 @@ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ gsub(/ /, ""); \ + gsub(/\r/, ""); \ printf(" %s", $$0) } \ END { printf("\n") }' $m && \ $(PRINTF) "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) :=" && \ @@ -359,6 +360,7 @@ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ gsub(/ /, ""); \ + gsub(/\r/, ""); \ printf(" %s", $$0) } \ END { printf("\n") }' $m \ ) >> $@ $(NEWLINE))