OpenJDK / amber / amber
changeset 13936:31d6ccdb1d27
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 18:24:52 +0200 |
| parents | 2805a3e211f3 a11476021d05 |
| children | 3c8a7ffbec3c |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags-top-repo Fri Oct 05 13:28:17 2012 -0700 +++ b/.hgtags-top-repo Wed Jul 05 18:24:52 2017 +0200 @@ -180,3 +180,4 @@ 76844579fa4b30929731115b237e477181a82394 jdk8-b56 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58 +dae9821589ccd2611bdf7084269b98e819091770 jdk8-b59
--- a/make/Defs-internal.gmk Fri Oct 05 13:28:17 2012 -0700 +++ b/make/Defs-internal.gmk Wed Jul 05 18:24:52 2017 +0200 @@ -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