diff options
author | Matthew Hancher <mdh@mit.edu> | 1998-07-08 05:14:27 +0000 |
---|---|---|
committer | Matthew Hancher <mdh@mit.edu> | 1998-07-08 05:14:27 +0000 |
commit | 2d0d7b36528efdf179f9cb725c7913cd8d65a27d (patch) | |
tree | e9f097aeb1e162eba7c078dd30d921184f100c8d | |
parent | 5b48c433cae4d44b74ff8e0ae76578bf34bbf26a (diff) | |
download | krb5-2d0d7b36528efdf179f9cb725c7913cd8d65a27d.tar.gz krb5-2d0d7b36528efdf179f9cb725c7913cd8d65a27d.tar.xz krb5-2d0d7b36528efdf179f9cb725c7913cd8d65a27d.zip |
Wed Jul 8 01:10:44 1998 Matthew D Hancher <mdh@mit.edu>
* aclocal.m4: Allow shared libraries to build properly under Irix
6.x with gcc. (This is actually a fix of a previous fix that
didn't make it into ChangeLog.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10624 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/aclocal.m4 | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 651c097807..1019766457 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +Wed Jul 8 01:10:44 1998 Matthew D Hancher <mdh@mit.edu> + + * aclocal.m4: Allow shared libraries to build properly under Irix + 6.x with gcc. (This is actually a fix of a previous fix that + didn't make it into ChangeLog.) + Thu Jul 2 20:41:02 1998 Theodore Y. Ts'o <tytso@mit.edu> * Makefile.in: Update commands to build the Macintosh MPW Makefile diff --git a/src/aclocal.m4 b/src/aclocal.m4 index df432ee611..e37a7827ad 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1009,12 +1009,26 @@ alpha-dec-osf*) RUN_ENV='SHLIB_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export SHLIB_PATH;' ;; -mips-sgi-irix*) +mips-sgi-irix5*) SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so SHOBJEXT=.o - # Kludge follows: + 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 + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' + ;; + +mips-sgi-irix6*) + 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 |