comparison make/jprt.config @ 29:746ca6b12c56

Merge
author ohair
date Wed, 06 Aug 2008 16:39:58 -0700
parents 55b2666e52e1 844619bd3580
children e18ad724572f
comparison
equal deleted inserted replaced
2:11a5806fc1dd 4:9afe7a9f43c2
144 144
145 # Get the compilers into path (make sure it matches ALT setting) 145 # Get the compilers into path (make sure it matches ALT setting)
146 if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then 146 if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
147 compiler_name=${JPRT_SOLARIS_COMPILER_NAME} 147 compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
148 else 148 else
149 # FIXUP: Change to SS12 when validated 149 compiler_name=SS12
150 #compiler_name=SS12
151 compiler_name=SS11
152 fi 150 fi
153 compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin 151 compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
154 ALT_COMPILER_PATH="${compiler_path}" 152 ALT_COMPILER_PATH="${compiler_path}"
155 export ALT_COMPILER_PATH 153 export ALT_COMPILER_PATH
156 dirMustExist "${compiler_path}" ALT_COMPILER_PATH 154 dirMustExist "${compiler_path}" ALT_COMPILER_PATH