Allow overriding the default compiler and merge SPARC

Apply quilt patch compiler-flags: Use $CC for the compiler instead of
forcing cc or gcc.  The corresponding upstream fix is waiting for work
to separate the kernel compiler from the userspace compilter, since $CC
should only be used for the latter on other platforms.

Also combines the sparc sysnames together, which is suitable upstream.

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index b8daa6a2082560b5931b1307dac8890d4785f0d6..f66ed066b86e87583351253d99343afc74452156 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -4,9 +4,8 @@ AC_DEFUN([OPENAFS_OSCONF], [
 dnl defaults, override in case below as needed
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+CCOBJ=$CC
+MT_CC=$CC
 XLIBS="${LIB_AFSDB}"
 
 dnl debugging and optimization flag defaults
@@ -327,9 +326,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux22)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -344,9 +342,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_linux*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -365,9 +362,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux24)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -386,9 +382,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -601,8 +596,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -619,8 +613,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux24|s390_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -637,8 +630,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc -fPIC"
+               CCOBJ="$CC -fPIC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -716,7 +708,7 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sparc64_linux*)
+       sparc*_linux*)
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -732,20 +724,6 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       sparc_linux22)
-               KERN_OPTMZ=-O2
-               LEX="flex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
        sun4_413)
                CCXPG2="/usr/xpg2bin/cc"
                CC="gcc"