Bump the version to 5.7.2.

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

diff --git a/hints/hpux.sh b/hints/hpux.sh
index da8485f..3413503 100644 (file)
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -63,16 +63,25 @@ case "$prefix" in
 case `$cc -v 2>&1`"" in
     *gcc*)  ccisgcc="$define"
            ccflags="$cc_cppflags"
+           if [ "X$gccversion" = "X" ]; then
+               # Done too late in Configure if hinted
+               gccversion=`$cc --version`
+               fi
            case "`getconf KERNEL_BITS 2>/dev/null`" in
                *64*)
-                   echo "main(){}">try.c
-                   # gcc with gas will not accept +DA2.0
-                   case "`$cc -c -Wa,+DA2.0 try.c 2>&1`" in
-                       *"+DA2.0"*)             # gas
-                           gnu_as=yes
+                   case "$gccversion" in
+                       3*) ccflags="$ccflags -mpa-risc-2-0"
                            ;;
-                       *)                      # HPas
-                           ccflags="$ccflags -Wa,+DA2.0"
+                       *)  echo "main(){}">try.c
+                           # gcc with gas will not accept +DA2.0
+                           case "`$cc -c -Wa,+DA2.0 try.c 2>&1`" in
+                               *"+DA2.0"*)             # gas
+                                   gnu_as=yes
+                                   ;;
+                               *)                      # HPas
+                                   ccflags="$ccflags -Wa,+DA2.0"
+                                   ;;
+                               esac
                            ;;
                        esac
                    # gcc with gld will not accept +vnocompatwarnings
@@ -81,8 +90,12 @@ case `$cc -v 2>&1`"" in
                            gnu_ld=yes
                            ;;
                        *)                      # HPld
-                           ldflags="$ldflags -Wl,+vnocompatwarnings"
-                           ccflags="$ccflags -Wl,+vnocompatwarnings"
+                           case "$gccversion" in
+                               [12]*)
+                                   ldflags="$ldflags -Wl,+vnocompatwarnings"
+                                   ccflags="$ccflags -Wl,+vnocompatwarnings"
+                                   ;;
+                               esac
                            ;;
                        esac
                    ;;
@@ -107,12 +120,12 @@ toke_cflags='ccflags="$ccflags -DARG_ZERO_IS_SCRIPT"'
 
 ### 64 BITNESS
 
-# Some gcc versions do native 64 bit long (e.g. 2.9-hppa-000310)
+# Some gcc versions do native 64 bit long (e.g. 2.9-hppa-000310 and gcc-3.0)
 # We have to force 64bitness to go search the right libraries
     gcc_64native=no
 case "$ccisgcc" in
     $define|true|[Yy])
-       echo 'int main(){long l;printf("%d\n",sizeof(l));}'>try.c
+       echo 'int main(){long l;printf("%d\\n",sizeof(l));}'>try.c
        $cc -o try $ccflags $ldflags try.c
        if [ "`try`" = "8" ]; then
            cat <<EOM >&4
@@ -183,8 +196,11 @@ EOM
                # anyway. Expect auto-detection of 64-bit enabled gcc on
                # HP-UX soon, including a user-friendly exit
                case $gcc_64native in
-                   no) ccflags="$ccflags -mlp64"
-                       ldflags="$ldflags -Wl,+DD64"
+                   no) case "$gccversion" in
+                           [12]*)  ccflags="$ccflags -mlp64"
+                                   ldflags="$ldflags -Wl,+DD64"
+                                   ;;
+                           esac
                        ;;
                    esac
                ;;