From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 22 Dec 2009 21:38:00 +0000 (+0000)
Subject: Solaris: Be more flexible about compilers
X-Git-Tag: openafs-devel-1_5_69~86
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0f0f6cd613fe1084af948f1765a5e7e0772b117d;p=packages%2Fo%2Fopenafs.git

Solaris: Be more flexible about compilers

OpenSolaris doesn't have its C compiler in /opt/SUNWspro/bin/cc,
but we still have to be careful to avoid gcc, as that can't
build the kernel module.

As a short term stop gap, add a PATH_PROG test which looks in
both /opt/SUNWspro/bin and /opt/SunStudioExpress/bin for cc.
We probably should look in more places, and in the long run,
we should probably be taking whatever autoconf gives us
(for userspace, at least)

Change-Id: Ie31cf1bf474650a081fc101a2aa40cfa6bd39423
Reviewed-on: http://gerrit.openafs.org/1020
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 183e2be2d..58495705e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -421,6 +421,8 @@ case $system in
         *-solaris*)
 		MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
+	        AC_PATH_PROG(SOLARISCC, [cc], ,
+		    [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin])
 		SOLARIS_UFSVFS_HAS_DQRWLOCK
 		SOLARIS_PROC_HAS_P_COREFILE
 		SOLARIS_FS_HAS_FS_ROLLED
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 9fdf142b2..071feee27 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -862,10 +862,10 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_55)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		SHLIB_CFLAGS="-KPIC"
@@ -880,10 +880,10 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_56)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -901,11 +901,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_57)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -923,11 +923,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_58)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -945,11 +945,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_59)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -967,11 +967,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_510)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -989,11 +989,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sun4x_511)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -1011,11 +1011,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sunx86_57)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -1032,11 +1032,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sunx86_58)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -1053,11 +1053,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sunx86_59)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -1074,11 +1074,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sunx86_510)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"
@@ -1095,11 +1095,11 @@ case $AFS_SYSNAME in
 		;;
 
 	sunx86_511)
-		CC="/opt/SUNWspro/bin/cc"
-		CCOBJ="/opt/SUNWspro/bin/cc"
+		CC=$SOLARISCC
+		CCOBJ=$SOLARISCC
 		LEX="lex"
 		LD="/usr/ccs/bin/ld"
-		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CC=$SOLARISCC
 		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
 		MT_LIBS="-lpthread -lsocket"
 		PAM_CFLAGS="-KPIC"