Merge

Mon, 07 Jul 2008 09:11:55 -0700

author
ohair
date
Mon, 07 Jul 2008 09:11:55 -0700
changeset 23
e42c6a1e1fb4
parent 20
2dab2f712e18
parent 22
cda4ce5a6494
child 24
3300a35a0bd5

Merge

     1.1 --- a/make/jprt.config	Wed Jul 02 12:55:04 2008 -0700
     1.2 +++ b/make/jprt.config	Mon Jul 07 09:11:55 2008 -0700
     1.3 @@ -142,9 +142,15 @@
     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=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin
     1.9 -    compiler_name=SS11
    1.10 +    # Get the compilers into path (make sure it matches ALT setting)
    1.11 +    if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
    1.12 +        compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
    1.13 +    else
    1.14 +        # FIXUP: Change to SS12 when validated
    1.15 +	#compiler_name=SS12
    1.16 +	compiler_name=SS11
    1.17 +    fi
    1.18 +    compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
    1.19      ALT_COMPILER_PATH="${compiler_path}"
    1.20      export ALT_COMPILER_PATH
    1.21      dirMustExist "${compiler_path}" ALT_COMPILER_PATH

mercurial