Mercurial > hg > icedtea9-forest > corba
changeset 90:27f41fcf3d6a
Merge
author | herrick |
---|---|
date | Mon, 29 Jun 2009 12:00:41 -0400 |
parents | 1b3e9fdc4fc5 (current diff) d20e45cd539f (diff) |
children | f982791bb7d4 863559dbbced |
files | |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 22 09:14:27 2009 -0400 +++ b/.hgtags Mon Jun 29 12:00:41 2009 -0400 @@ -36,3 +36,4 @@ 7e6b2b55c00cc523b468272353ada3979adbbf16 jdk7-b59 f1e1cccbd13aa96d2d8bd872782ff764010bc22c jdk7-b60 e906b16a12a9a63b615898afa5d9673cbd1c5ab8 jdk7-b61 +65b66117dbd70a493e9644aeb4033cf95a4e3c99 jdk7-b62
--- a/make/Makefile Mon Jun 22 09:14:27 2009 -0400 +++ b/make/Makefile Mon Jun 29 12:00:41 2009 -0400 @@ -106,7 +106,12 @@ SOURCE_LEVEL = 5 BOOTSTRAP_TARGET_LEVEL = 5 -TARGET_LEVEL = 6 + +ifdef TARGET_CLASS_VERSION + TARGET_LEVEL = $(TARGET_CLASS_VERSION) +else + TARGET_LEVEL = 6 +endif ifndef TARGET_JAVA TARGET_JAVA = java