changeset 928:455092274fd1

6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris Reviewed-by: tbell
author ohair
date Wed, 06 Aug 2008 16:08:15 -0700
parents c590b856cfe2
children d958f883b42a
files corba/make/common/shared/Compiler-sun.gmk corba/make/jprt.config
diffstat 2 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/corba/make/common/shared/Compiler-sun.gmk	Wed Aug 06 14:30:28 2008 -0700
+++ b/corba/make/common/shared/Compiler-sun.gmk	Wed Aug 06 16:08:15 2008 -0700
@@ -31,11 +31,8 @@
 
 # Sun Studio Compiler settings specific to Solaris
 ifeq ($(PLATFORM), solaris)
-  # FIXUP: Change to SS12 when validated
-  #COMPILER_VERSION=SS12
-  #REQUIRED_CC_VER=5.9
-  COMPILER_VERSION=SS11
-  REQUIRED_CC_VER=5.8
+  COMPILER_VERSION=SS12
+  REQUIRED_CC_VER=5.9
   CC             = $(COMPILER_PATH)cc
   CPP            = $(COMPILER_PATH)cc -E
   CXX            = $(COMPILER_PATH)CC
--- a/corba/make/jprt.config	Wed Aug 06 14:30:28 2008 -0700
+++ b/corba/make/jprt.config	Wed Aug 06 16:08:15 2008 -0700
@@ -127,9 +127,7 @@
     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
+	compiler_name=SS12
     fi
     compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
     ALT_COMPILER_PATH="${compiler_path}"