Merge
authorohair
Mon Jul 07 09:11:55 2008 -0700 (16 months ago)
changeset 21e42c6a1e1fb4
parent 182dab2f712e18
parent 20cda4ce5a6494
child 223300a35a0bd5
Merge
--- 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 @@ if [ "${osname}" = SunOS ] ; then
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