Mercurial > hg > openjdk > jdk7
changeset 20:cda4ce5a6494
6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)
Summary: Changes to support building with SS12.
Reviewed-by: tbell
| author | ohair |
|---|---|
| date | Thu, 03 Jul 2008 10:09:25 -0700 |
| parents | 14c2c623d687 |
| children | e42c6a1e1fb4 |
| files | make/jprt.config |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.config Fri Jun 20 08:44:54 2008 -0700 +++ b/make/jprt.config Thu Jul 03 10:09:25 2008 -0700 @@ -142,9 +142,15 @@ solaris_arch=i386 fi - # Get the SS11 compilers into path (make sure it matches ALT setting) - compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin - compiler_name=SS11 + # Get the compilers into path (make sure it matches ALT setting) + 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 + fi + compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin ALT_COMPILER_PATH="${compiler_path}" export ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH