6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
Reviewed-by: tbell
This commit is contained in:
parent
d87089df64
commit
8e03026cf7
@ -31,11 +31,8 @@ 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
|
||||||
#COMPILER_VERSION=SS12
|
REQUIRED_CC_VER=5.9
|
||||||
#REQUIRED_CC_VER=5.9
|
|
||||||
COMPILER_VERSION=SS11
|
|
||||||
REQUIRED_CC_VER=5.8
|
|
||||||
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
|
||||||
|
@ -127,9 +127,7 @@ if [ "${osname}" = SunOS ] ; then
|
|||||||
if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
|
if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
|
||||||
compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
|
compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
|
||||||
else
|
else
|
||||||
# FIXUP: Change to SS12 when validated
|
compiler_name=SS12
|
||||||
#compiler_name=SS12
|
|
||||||
compiler_name=SS11
|
|
||||||
fi
|
fi
|
||||||
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
|
compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin
|
||||||
ALT_COMPILER_PATH="${compiler_path}"
|
ALT_COMPILER_PATH="${compiler_path}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user