diff options
| author | ohair <none@none> | 2008-08-06 16:39:58 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2008-08-06 16:39:58 -0700 |
| commit | 75426227e8cc7ec38fb20e2befb30ea30803faed (patch) | |
| tree | 64e11186369808c3722238b57d39d0dc44f7c0a7 | |
| parent | 6ffa068fce1cb1f2c24e0cafb384c76fefd60880 (diff) | |
| parent | ecde601a0f30a7dcbdb9a1cc05d0ec8a79538c6f (diff) | |
Merge
| -rw-r--r-- | README-builds.html | 12 | ||||
| -rw-r--r-- | make/jprt.config | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/README-builds.html b/README-builds.html index 37998f9..d4f0087 100644 --- a/README-builds.html +++ b/README-builds.html @@ -132,7 +132,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11 </td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris SPARCV9 (64bit)</td> @@ -141,7 +141,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris X86 (32bit)</td> @@ -150,7 +150,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Solaris X64 (64bit)</td> @@ -159,7 +159,7 @@ See <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/JavaSE" target="_blank"> SunSolve</a> for patch downloads. </td> - <td>Sun Studio 11</td> + <td>Sun Studio 12</td> </tr> <tr> <td>Windows X86 (32bit)</td> @@ -831,8 +831,8 @@ <blockquote> At a minimum, the <a href="http://developers.sun.com/sunstudio/index.jsp" target="_blank"> - Sun Studio 11 Compilers</a> - (containing version 5.8 of the C and C++ compilers) is required, + Sun Studio 12 Compilers</a> + (containing version 5.9 of the C and C++ compilers) is required, with patches from the <a href="http://sunsolve.sun.com/pub-cgi/show.pl?target=patches/patch-access" target="_blank"> SunSolve web site</a>. diff --git a/make/jprt.config b/make/jprt.config index 2a8f543..08e56ca 100644 --- a/make/jprt.config +++ b/make/jprt.config @@ -146,9 +146,7 @@ if [ "${osname}" = SunOS ] ; then if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then compiler_name=${JPRT_SOLARIS_COMPILER_NAME} else - # FIXUP: Change to SS12 when validated - #compiler_name=SS12 - compiler_name=SS11 + compiler_name=SS12 fi compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin ALT_COMPILER_PATH="${compiler_path}" |