Third time's the charm.... *sigh* (ya irix6.3/gcc fix)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10626 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e37a7827ad56620ec5152f700b63bd3abbb6b579..152246e66668acaf1b96f61e8dfe9f66c601c0e8 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1009,12 +1009,17 @@ alpha-dec-osf*)
        RUN_ENV='SHLIB_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export SHLIB_PATH;'
        ;;
 
-mips-sgi-irix5*)
+mips-sgi-irix6.3)      # This is a Kludge; see below
        SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
        SHLIBSEXT='.so.$(LIBMAJOR)'
        SHLIBEXT=.so
        SHOBJEXT=.o
-       LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
+       # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld)
+       if test "$GCC" = yes; then
+               LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
+       else
+               LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
+       fi
        SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        # no gprof for Irix...
        PROFFLAGS=-p
@@ -1023,17 +1028,12 @@ mips-sgi-irix5*)
        RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
        ;;
 
-mips-sgi-irix6*)
+mips-sgi-irix*)
        SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
        SHLIBSEXT='.so.$(LIBMAJOR)'
        SHLIBEXT=.so
        SHOBJEXT=.o
-       # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld)
-       if test "$GCC" = yes; then
-               LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
-       else
-               LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
-       fi
+       LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
        SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        # no gprof for Irix...
        PROFFLAGS=-p