Mercurial > hg > openjdk > jdk7
changeset 21:e42c6a1e1fb4
Merge
author | ohair |
---|---|
date | Mon, 07 Jul 2008 09:11:55 -0700 |
parents | 2dab2f712e18 (current diff) cda4ce5a6494 (diff) |
children | 3300a35a0bd5 |
files | |
diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.config Wed Jul 02 12:55:04 2008 -0700 +++ b/make/jprt.config Mon Jul 07 09:11:55 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