stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6563752: Build and test JDK7 with Sun Studio 12 Express compilers (prep makefiles)

Browse Source 
Changes to support building with SS12.

Reviewed-by: tbell
This commit is contained in:
Kelly O'Hair 2008-06-04 09:27:06 -07:00
parent 3021d76b45
commit ea96ee4b47
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
corba/make/common/shared/Compiler-sun.gmk
View File

@ -31,6 +31,9 @@ COMPILER_NAME=Sun Studio
# Sun Studio Compiler settings specific to Solaris # Sun Studio Compiler settings specific to Solaris
ifeq ($(PLATFORM), solaris) ifeq ($(PLATFORM), solaris)
# FIXUP: Change to SS12 when validated
#COMPILER_VERSION=SS12
#REQUIRED_CC_VER=5.9
COMPILER_VERSION=SS11 COMPILER_VERSION=SS11
REQUIRED_CC_VER=5.8 REQUIRED_CC_VER=5.8
CC = $(COMPILER_PATH)cc CC = $(COMPILER_PATH)cc
@ -51,8 +54,8 @@ endif
# Sun Studio Compiler settings specific to Linux # Sun Studio Compiler settings specific to Linux
ifeq ($(PLATFORM), linux) ifeq ($(PLATFORM), linux)
# This has not been tested # This has not been tested
COMPILER_VERSION=SS11 COMPILER_VERSION=SS12
REQUIRED_CC_VER=5.8 REQUIRED_CC_VER=5.9
CC = $(COMPILER_PATH)cc CC = $(COMPILER_PATH)cc
CPP = $(COMPILER_PATH)cc -E CPP = $(COMPILER_PATH)cc -E
CXX = $(COMPILER_PATH)CC CXX = $(COMPILER_PATH)CC

10
corba/make/jprt.config
View File

@ -123,9 +123,15 @@ if [ "${osname}" = SunOS ] ; then
solaris_arch=i386 solaris_arch=i386
fi fi
# Get the SS11 compilers into path (make sure it matches ALT setting) # Get the compilers into path (make sure it matches ALT setting)
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/SS11/bin 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=SS11
fi
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
ALT_COMPILER_PATH="${compiler_path}" ALT_COMPILER_PATH="${compiler_path}"
export ALT_COMPILER_PATH export ALT_COMPILER_PATH
dirMustExist "${compiler_path}" ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH