X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Faix.sh;h=40c7b66ae4011e18a6b87508ea4495d38dd4c54c;hb=6d6ae9622174ffaa5c3fb93887744deb77298e45;hp=10d5d64bc80e75b7924188820f1b43724b75b0da;hpb=afd1eb533c8ea286efcac6fd054ae7cebaf0dfe3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/aix.sh b/hints/aix.sh
index 10d5d64..40c7b66 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -160,14 +160,14 @@ EOF
      5.0.0.0)
 	cat >&4 <<EOF
 ***
-*** This C compiler ($ccversion) is known to have optimizer problems
-*** when compiling perl.c.
+*** This C compiler ($ccversion) is known to have too many optimizer
+*** bugs to compile a working Perl.
 ***
-*** Disabling optimization for that file but consider upgrading
-*** your C compiler.
+*** Consider upgrading your C compiler, or getting the GNU cc (gcc).
 ***
+*** Cannot continue, aborting.
 EOF
-perl_cflags='optimize='
+	exit 1
 	;;
      5.0.1.0)
 	cat >&4 <<EOF
@@ -326,8 +326,8 @@ EOM
         # Move xld-spefific -bflags.
         ccflags="`echo $ccflags | sed -e 's@ -b@ -Wl,-b@g'`"
         ldflags="`echo ' '$ldflags | sed -e 's@ -b@ -Wl,-b@g'`"
+        lddlflags="`echo ' '$lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
         ld='gcc'
-        lddlflags="`echo $lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
         echo >&4 "(using ccflags   $ccflags)"
         echo >&4 "(using ldflags   $ldflags)"
         echo >&4 "(using lddlflags $lddlflags)"
@@ -475,21 +475,25 @@ then
       *)     ldflags="$ldflags -brtl" ;;
       esac
 else
-    # If the C++ libraries, libC and libC_r, are available we will prefer them
-    # over the vanilla libc, because the libC contain loadAndInit() and
-    # terminateAndUnload() which work correctly with C++ statics while libc
-    # load() and unload() do not.  See ext/DynaLoader/dl_aix.xs.
-    # The C-to-C_r switch is done by usethreads.cbu, if needed.
-    if test -f /lib/libC.a -a X"`$cc -v 2>&1 | grep gcc`" = X; then
-	# Cify libswanted.
-	set `echo X "$libswanted "| sed -e 's/ c / C c /'`
-	shift
-	libswanted="$*"
-	# Cify lddlflags.
-	set `echo X "$lddlflags "| sed -e 's/ -lc / -lC -lc /'`
-	shift
-	lddlflags="$*"
-    fi
+    case `oslevel` in
+	4.2.*)	;;	# libC_r has broke gettimeofday
+        *)  # If the C++ libraries, libC and libC_r, are available we will
+	    # prefer them over the vanilla libc, because the libC contain
+	    # loadAndInit() and terminateAndUnload() which work correctly
+	    # with C++ statics while libc load() and unload() do not. See
+	    # ext/DynaLoader/dl_aix.xs. The C-to-C_r switch is done by
+	    # usethreads.cbu, if needed.
+	    if test -f /lib/libC.a -a X"`$cc -v 2>&1 | grep gcc`" = X; then
+		# Cify libswanted.
+		set `echo X "$libswanted "| sed -e 's/ c / C c /'`
+		shift
+		libswanted="$*"
+		# Cify lddlflags.
+		set `echo X "$lddlflags "| sed -e 's/ -lc / -lC -lc /'`
+		shift
+		lddlflags="$*"
+	    fi
+	esac
 fi
 
 # EOF