Merge
This commit is contained in:
commit
1138e57967
@ -142,9 +142,15 @@ if [ "${osname}" = SunOS ] ; then
|
|||||||
solaris_arch=i386
|
solaris_arch=i386
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get the SS11 compilers into path (make sure it matches ALT setting)
|
# Get the compilers into path (make sure it matches ALT setting)
|
||||||
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin
|
if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
|
||||||
compiler_name=SS11
|
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}"
|
ALT_COMPILER_PATH="${compiler_path}"
|
||||||
export ALT_COMPILER_PATH
|
export ALT_COMPILER_PATH
|
||||||
dirMustExist "${compiler_path}" ALT_COMPILER_PATH
|
dirMustExist "${compiler_path}" ALT_COMPILER_PATH
|
||||||
|
Loading…
Reference in New Issue
Block a user