Fix a typo and add some clarification to change #26387.

[p5sagit/p5-mst-13.2.git] / hints / hpux.sh

diff --git a/hints/hpux.sh b/hints/hpux.sh
index 8fe7092..3ce1d85 100644 (file)
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -84,7 +84,7 @@ case `$cc -v 2>&1`"" in
                [012]*) # HP-UX and gcc-2.* break UINT32_MAX :-(
                        ccflags="$ccflags -DUINT32_MAX_BROKEN"
                        ;;
-               3*)     # GCC (both 32bit and 64bit) will define __STDC_EXT__
+               [34]*) # GCC (both 32bit and 64bit) will define __STDC_EXT__
                        # by default when using GCC 3.0 and newer versions of
                        # the compiler.
                        cppflags="$cc_cppflags"
@@ -94,7 +94,7 @@ case `$cc -v 2>&1`"" in
                *64*)
                    echo "main(){}">try.c
                    case "$gccversion" in
-                       3*)
+                       [34]*)
                            case "$archname" in
                                PA-RISC*)
                                    case "$ccflags" in
@@ -136,7 +136,28 @@ case `$cc -v 2>&1`"" in
                esac
            ;;
     *)      ccisgcc=''
-           ccversion=`which cc | xargs what | awk '/Compiler/{print $2}/Itanium/{print $6,$7}'`
+           # What cannot be use in combination with ccache links :(
+           cc_found=""
+           for p in `echo $PATH | tr : ' ''` ; do
+               x="$p/cc"
+               if [ -f $x ] && [ -x $x ]; then
+                   if [ -h $x ]; then
+                       l=`ls -l $x | sed 's,.*-> ,,'`
+                       case $l in
+                           /*) x=$l            ;;
+                           *)  x="$p/$l"       ;;
+                           esac
+                       fi
+                   x=`echo $x | sed 's,/\./,/,g'`
+                   case $x in
+                       *ccache*) ;;
+                       *) [ -z "$cc_found" ] && cc_found=$x ;;
+                       esac
+                   fi
+               done
+           [ -z "$cc_found" ] && cc_found=`which cc`
+           what $cc_found >&4
+           ccversion=`what $cc_found | awk '/Compiler/{print $2}/Itanium/{print $6,$7}'`
            case "$ccflags" in
                "-Ae "*) ;;
                *)  ccflags="-Ae $cc_cppflags"
@@ -248,15 +269,16 @@ EOM
                # HP-UX soon, including a user-friendly exit
                case $gcc_64native in
                    no) case "$gccversion" in
-                           [123]*) ccflags="$ccflags -mlp64"
-                                   case "$archname" in
-                                       PA-RISC*)
-                                           ldflags="$ldflags -Wl,+DD64"
-                                           ;;
-                                       IA64*)
-                                           ldflags="$ldflags -mlp64"
-                                           ;;
-                                       esac
+                           [1234]*)
+                               ccflags="$ccflags -mlp64"
+                               case "$archname" in
+                                   PA-RISC*)
+                                       ldflags="$ldflags -Wl,+DD64"
+                                       ;;
+                                   IA64*)
+                                       ldflags="$ldflags -mlp64"
+                                       ;;
+                                   esac
                                    ;;
                            esac
                        ;;