Fri, 12 Oct 2012 14:46:47 -0700
Merge
1.1 --- a/.hgtags Tue Oct 09 13:25:27 2012 +0100 1.2 +++ b/.hgtags Fri Oct 12 14:46:47 2012 -0700 1.3 @@ -179,3 +179,6 @@ 1.4 b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55 1.5 76844579fa4b30929731115b237e477181a82394 jdk8-b56 1.6 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 1.7 +9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58 1.8 +dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59 1.9 +e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
2.1 --- a/make/Defs-internal.gmk Tue Oct 09 13:25:27 2012 +0100 2.2 +++ b/make/Defs-internal.gmk Fri Oct 12 14:46:47 2012 -0700 2.3 @@ -330,6 +330,10 @@ 2.4 PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ 2.5 PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) 2.6 2.7 +ifdef OPENJDK 2.8 + COMMON_BUILD_ARGUMENTS += OPENJDK=$(OPENJDK) 2.9 +endif 2.10 + 2.11 ifdef ARCH_DATA_MODEL 2.12 COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) 2.13 endif