Mercurial > hg > truffle
diff make/jprt.config @ 194:4f91c08b3e44 jdk7-b29
Merge
author | trims |
---|---|
date | Tue, 17 Jun 2008 15:27:05 -0700 |
parents | a49545cab84a |
children | d1605aabd0a1 |
line wrap: on
line diff
--- a/make/jprt.config Tue Jun 10 10:22:49 2008 -0700 +++ b/make/jprt.config Tue Jun 17 15:27:05 2008 -0700 @@ -68,8 +68,23 @@ solaris_arch=i386 fi - # Get the SS11 compilers into path (make sure it matches ALT setting) - compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/SS11/bin + if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then + compiler_name=${JPRT_SOLARIS_COMPILER_NAME} + else + if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6" -o \ + "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10" -o \ + "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then + # All jdk6 builds use SS11 + compiler_name=SS11 + else + # FIXUP: Change to SS12 once it has been validated. + #compiler_name=SS12 + compiler_name=SS11 + fi + fi + + # Get into path (make sure it matches ALT setting) + compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/${compiler_name}/bin dirMustExist "${compiler_path}" COMPILER_PATH path4sdk=${compiler_path}