Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Compiler-sun.gmk	Thu May 22 09:37:38 2008 -0700
     1.2 +++ b/make/common/shared/Compiler-sun.gmk	Wed Jun 04 09:27:06 2008 -0700
     1.3 @@ -31,6 +31,9 @@
     1.4  
     1.5  # Sun Studio Compiler settings specific to Solaris
     1.6  ifeq ($(PLATFORM), solaris)
     1.7 +  # FIXUP: Change to SS12 when validated
     1.8 +  #COMPILER_VERSION=SS12
     1.9 +  #REQUIRED_CC_VER=5.9
    1.10    COMPILER_VERSION=SS11
    1.11    REQUIRED_CC_VER=5.8
    1.12    CC             = $(COMPILER_PATH)cc
    1.13 @@ -51,8 +54,8 @@
    1.14  # Sun Studio Compiler settings specific to Linux
    1.15  ifeq ($(PLATFORM), linux)
    1.16    # This has not been tested
    1.17 -  COMPILER_VERSION=SS11
    1.18 -  REQUIRED_CC_VER=5.8
    1.19 +  COMPILER_VERSION=SS12
    1.20 +  REQUIRED_CC_VER=5.9
    1.21    CC             = $(COMPILER_PATH)cc
    1.22    CPP            = $(COMPILER_PATH)cc -E
    1.23    CXX            = $(COMPILER_PATH)CC

     2.1 --- a/make/jprt.config	Thu May 22 09:37:38 2008 -0700
     2.2 +++ b/make/jprt.config	Wed Jun 04 09:27:06 2008 -0700
     2.3 @@ -123,9 +123,15 @@
     2.4  	solaris_arch=i386
     2.5      fi
     2.6  
     2.7 -    # Get the SS11 compilers into path (make sure it matches ALT setting)
     2.8 -    compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin
     2.9 -    compiler_name=SS11
    2.10 +    # Get the compilers into path (make sure it matches ALT setting)
    2.11 +    if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
    2.12 +        compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
    2.13 +    else
    2.14 +        # FIXUP: Change to SS12 when validated
    2.15 +	#compiler_name=SS12
    2.16 +        compiler_name=SS11
    2.17 +    fi
    2.18 +    compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
    2.19      ALT_COMPILER_PATH="${compiler_path}"
    2.20      export ALT_COMPILER_PATH
    2.21      dirMustExist "${compiler_path}" ALT_COMPILER_PATH