Merge
This commit is contained in:
commit
9267c4dc26
@ -374,3 +374,4 @@ b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128
|
|||||||
f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
|
f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129
|
||||||
d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
|
d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130
|
||||||
8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
|
8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
|
||||||
|
a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
|
||||||
|
@ -251,8 +251,6 @@ SUPPORT_HEADLESS:=@SUPPORT_HEADLESS@
|
|||||||
# Legacy support
|
# Legacy support
|
||||||
USE_NEW_HOTSPOT_BUILD:=@USE_NEW_HOTSPOT_BUILD@
|
USE_NEW_HOTSPOT_BUILD:=@USE_NEW_HOTSPOT_BUILD@
|
||||||
|
|
||||||
MACOSX_UNIVERSAL=@MACOSX_UNIVERSAL@
|
|
||||||
|
|
||||||
# JDK_OUTPUTDIR specifies where a working jvm is built.
|
# JDK_OUTPUTDIR specifies where a working jvm is built.
|
||||||
# You can run $(JDK_OUTPUTDIR)/bin/java
|
# You can run $(JDK_OUTPUTDIR)/bin/java
|
||||||
# Though the layout of the contents of $(JDK_OUTPUTDIR) is not
|
# Though the layout of the contents of $(JDK_OUTPUTDIR) is not
|
||||||
|
@ -229,6 +229,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
|
|||||||
sub(/public/, ""); \
|
sub(/public/, ""); \
|
||||||
sub(/\/\/.*/, ""); \
|
sub(/\/\/.*/, ""); \
|
||||||
sub(/\/\*.*\*\//, ""); \
|
sub(/\/\*.*\*\//, ""); \
|
||||||
|
gsub(/^ +\*.*/, ""); \
|
||||||
gsub(/ /, ""); \
|
gsub(/ /, ""); \
|
||||||
printf(" %s", $$0) } \
|
printf(" %s", $$0) } \
|
||||||
END { printf("\n") }' $m \
|
END { printf("\n") }' $m \
|
||||||
|
Loading…
Reference in New Issue
Block a user