6724669: JDK7: Official change to Sun Studio 12 compilers on Solaris
Reviewed-by: tbell
This commit is contained in:
parent
413cf8882e
commit
ac52b07e8d
File diff suppressed because it is too large
Load Diff
@ -1,28 +0,0 @@
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||
<html>
|
||||
|
||||
<head> <title>OpenJDK README</title> </head>
|
||||
|
||||
<!-- ====================================================== -->
|
||||
<hr noshade="noshade" size="3">
|
||||
<center>
|
||||
<h1>OpenJDK README</h1>
|
||||
</center>
|
||||
|
||||
<!-- ------------------------------------------------------ -->
|
||||
<hr noshade="noshade" size="3">
|
||||
|
||||
<h2>TBD</h2>
|
||||
|
||||
<h2>Building the OpenJDK</h2>
|
||||
|
||||
<p>
|
||||
Refer to <a href="README-builds.html">the OpenJDK Build README</a>
|
||||
for build instructions.
|
||||
|
||||
<!-- ====================================================== -->
|
||||
|
||||
<hr noshade="noshade" size="3">
|
||||
|
||||
</body>
|
||||
</html>
|
@ -31,11 +31,8 @@ COMPILER_NAME=Sun Studio
|
||||
|
||||
# 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
|
||||
|
@ -137,9 +137,7 @@ if [ "${osname}" = SunOS ] ; then
|
||||
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}"
|
||||
|
Loading…
Reference in New Issue
Block a user