OpenJDK / icedtea / jdk7 / corba
changeset 23:0a812b9824e5 jdk7-b34
Merge
| author | tbell |
|---|---|
| date | Thu, 14 Aug 2008 22:14:08 -0700 |
| parents | e0e03ab25da0 05bf6aacc874 |
| children | 3867c4d14a5b 0d92f2ecc8ff |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Aug 07 18:00:57 2008 -0700 +++ b/.hgtags Thu Aug 14 22:14:08 2008 -0700 @@ -7,3 +7,4 @@ c0252adbb2abbfdd6c35595429ac6fbdd98e20ac jdk7-b30 ef6af34d75a7b44e77083f1d4ee47631fa09d3b4 jdk7-b31 80a0f46a6203e727012bd579fe38a609b83decce jdk7-b32 +6a5b9d2f8b20de54e3bfe33cd12bd0793caedc4e jdk7-b33
--- a/make/common/shared/Compiler-sun.gmk Thu Aug 07 18:00:57 2008 -0700 +++ b/make/common/shared/Compiler-sun.gmk Thu Aug 14 22:14:08 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/make/jprt.config Thu Aug 07 18:00:57 2008 -0700 +++ b/make/jprt.config Thu Aug 14 22:14:08 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}"