On 2016-11-30 17:14, Erik Joelsson wrote:
This patch slightly adjusts the matching pattern which identifies the C/C++ compilers as Solaris Studio/Oracle Developer Studio so that the new output of 12.5 is also matched. Note that this only makes configure accept the new version as a valid compiler. The build dies almost immediately due to compilation errors.


Bug: https://bugs.openjdk.java.net/browse/JDK-8164304

Patch:

diff -r 059a089b973d common/autoconf/toolchain.m4
--- a/common/autoconf/toolchain.m4      Wed Nov 30 19:28:45 2016 +0530
+++ b/common/autoconf/toolchain.m4      Wed Nov 30 17:04:40 2016 +0100
@@ -333,9 +333,11 @@
   if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     # cc -V output typically looks like
     #     cc: Sun C 5.12 Linux_i386 2011/11/16
+    # or
+    #     cc: Studio 12.5 Sun C 5.14 SunOS_sparc 2016/05/31
     COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1`
     # Check that this is likely to be the Solaris Studio cc.
- $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.* Sun $COMPILER_NAME" > /dev/null
     if test $? -ne 0; then
       ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1`
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])

Looks good to me.

/Magnus


/Erik


Reply via email to