Only use -Wl,-oldstyle_liblookup if using native linker. Check for

native linker if using gcc.

ticket: 927

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8dc33ca4dd7b0a4c471516380ccc2c88b8f2a40d..5c92e94eff24aa2f1cc494f9b783b0e96a735742 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4 (WITH_CC): Check for GNU linker.
+
 2004-09-21  Tom Yu  <tlyu@mit.edu>
 
        * alcocal.m4 (AC_LIBRARY_NET): Additionally, check ns_initparse,

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 87c071d23d82938b239527924c4e7e985e06700e..32934fac74d6ed6bf7346c82e34845a922b055a7 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -541,6 +541,14 @@ if test $ac_cv_c_compiler_gnu = yes ; then
      else HAVE_GCC=
 fi
 AC_SUBST(HAVE_GCC)
+AC_CACHE_CHECK([for GNU linker], krb5_cv_prog_gnu_ld,
+[krb5_cv_prog_gnu_ld=no
+if test "$GCC" = yes; then
+  if AC_TRY_COMMAND([$CC -Wl,-v 2>&1 dnl
+                       | grep "GNU ld" > /dev/null]); then
+    krb5_cv_prog_gnu_ld=yes
+  fi
+fi])
 # maybe add -Waggregate-return, or can we assume that actually works by now?
 # -Wno-comment used to be used for SunOS system header <sys/stream.h>
 # -Wno-long-long, if needed, for k5-platform.h without inttypes.h etc.

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 1f3c31f5c80ee446bc57aa2003464f18bf5ab4b0..2f1bb9f64cc50401001a877fb9d20b3b980ca739 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-22  Tom Yu  <tlyu@mit.edu>
+
+       * shlib.conf (alpha*-dec-osf*): Only use -Wl,-oldstyle_liblookup
+       if using native linker, with check for native linker if gcc is
+       being used.
+
 2004-09-21  Ken Raeburn  <raeburn@mit.edu>
 
        * shlib.conf (*-*-linux*, *-*-gnu*, *-*-k*bsd*-gnu): Don't use the

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index d107dddb956592983713e51a84f87d9e30d857a8..ccff18731487f0d835bc640b3bc25e46b3a126c1 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -45,7 +45,8 @@ alpha*-dec-osf*)
        PROFFLAGS=-pg
        RPATH_FLAG='-Wl,-rpath -Wl,'
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)'
-       if test "$krb5_cv_prog_gcc" = yes; then
+       if test "$krb5_cv_prog_gcc" = yes \
+               && test "$krb5_cv_gnu_ld" = yes; then
                # Really should check for gnu ld vs system ld, too.
                CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)'
        else