Fix imake segfault on OpenIndiana

Version string changed in distributed GCC6, confusing
get_sun_compiler_versions().

diff --git a/cde/config/imake/imake.c b/cde/config/imake/imake.c
index 7c429e42c38ce8245130fa7ae85c3fae44f15239..14422e64d65c518e53b44ab469dfe0cf2f86dfac 100644 (file)
--- a/cde/config/imake/imake.c
+++ b/cde/config/imake/imake.c
@@ -1157,7 +1157,7 @@ get_sun_compiler_versions(FILE *inFile)
     strncat (cmd, " --version 2>&1", 15);
     if ((ccproc = popen (cmd, "r")) != NULL) {
       if (fgets (buf, PATH_MAX, ccproc) != NULL) {
-       vptr = strrchr (buf, 'G');
+       vptr = strrchr (buf, ')');
        for (; !isdigit(*vptr); vptr++);
        ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
        fprintf (inFile,
@@ -1182,7 +1182,7 @@ get_sun_compiler_versions(FILE *inFile)
     strncat (cmd, " --version 2>&1", 15);
     if ((ccproc = popen (cmd, "r")) != NULL) {
       if (fgets (buf, PATH_MAX, ccproc) != NULL) {
-       vptr = strrchr (buf, 'G');
+       vptr = strrchr (buf, ')');
        for (; !isdigit(*vptr); vptr++);
        ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
        fprintf (inFile,