Mercurial > hg > openjdk > aarch64-port
changeset 489:ce2b111ee869
Merge
author | lana |
---|---|
date | Fri, 12 Oct 2012 14:46:47 -0700 |
parents | 4bde5640fb36 (current diff) 20ff117b5090 (diff) |
children | 744e165aaf33 |
files | |
diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Oct 09 13:25:27 2012 +0100 +++ b/.hgtags Fri Oct 12 14:46:47 2012 -0700 @@ -179,3 +179,6 @@ b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55 76844579fa4b30929731115b237e477181a82394 jdk8-b56 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 +9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58 +dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59 +e07f499b9dccb529ecf74172cf6ac11a195ec57a jdk8-b60
--- a/make/Defs-internal.gmk Tue Oct 09 13:25:27 2012 +0100 +++ b/make/Defs-internal.gmk Fri Oct 12 14:46:47 2012 -0700 @@ -330,6 +330,10 @@ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) +ifdef OPENJDK + COMMON_BUILD_ARGUMENTS += OPENJDK=$(OPENJDK) +endif + ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) endif