Merge

adf4a7ea · xdono · 0dd4f98d · 816ec7d6 · adf4a7ea · adf4a7ea
隐藏空白更改
内联并排

Showing with 5 addition and 3 deletion

.hgtags .hgtags +2 -0

make/jprt.properties make/jprt.properties +3 -3

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -30,3 +30,5 @@ d17d927ad9bdfafae32451645d182acb7bed7be6 jdk7-b49
 dbdeb4a7581b2a8699644b91cae6793cb01953f7 jdk7-b53
 197a7f881937d406a01214aa9ded49c073f7d380 jdk7-b54
 7394a8694cedea574c7dbd38de87f4cbe0e27b8a jdk7-b55
+825f23a4f262eb06cfc94406140f3bfecb17ffe8 jdk7-b56
+4030cc469205bbd517ca629fb170afb81760bbc5 jdk7-b57
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -32,13 +32,13 @@ solaris_sparc_5.10,\
 solaris_sparcv9_5.10,\
 solaris_i586_5.10,\
 solaris_x64_5.10,\
-linux_i586,\
-linux_x64,\
+linux_i586_2.6,\
+linux_x64_2.6,\
 windows_i586,\
 windows_x64

 # The different build flavors we want
-jprt.build.flavors=product
+jprt.build.flavors=product,fastdebug

 # Explicitly designate what the 32bit match is for the 64bit build
 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10