1.1 --- a/make/jprt.config Tue May 20 09:47:05 2008 -0700
1.2 +++ b/make/jprt.config Tue May 27 09:47:18 2008 -0700
1.3 @@ -68,8 +68,23 @@
1.4 solaris_arch=i386
1.5 fi
1.6
1.7 - # Get the SS11 compilers into path (make sure it matches ALT setting)
1.8 - compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/SS11/bin
1.9 + if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
1.10 + compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
1.11 + else
1.12 + if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6" -o \
1.13 + "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10" -o \
1.14 + "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
1.15 + # All jdk6 builds use SS11
1.16 + compiler_name=SS11
1.17 + else
1.18 + # FIXUP: Change to SS12 once it has been validated.
1.19 + #compiler_name=SS12
1.20 + compiler_name=SS11
1.21 + fi
1.22 + fi
1.23 +
1.24 + # Get into path (make sure it matches ALT setting)
1.25 + compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/${compiler_name}/bin
1.26 dirMustExist "${compiler_path}" COMPILER_PATH
1.27 path4sdk=${compiler_path}
1.28
