* makeshlib.sh (*-*-aix*): Echo more stuff before running it. Always use

/bin/ld -- the GNU linker isn't supported yet.  Don't pass -x or -bfilelist.
Whitespace changes.

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

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index 0e59bee72dcc281181f8d190b4e4816639b6b3e0..79150652a2258bd2c8e18172c40bcd3a06b6bfad 100644 (file)
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 31 01:34:41 1996  Ken Raeburn  <raeburn@cygnus.com>
+
+       * makeshlib.sh (*-*-aix*): Echo more stuff before running it.
+       Always use /bin/ld -- the GNU linker isn't supported yet.  Don't
+       pass -x or -bfilelist.  Whitespace changes.
+
 Thu Aug 15 20:48:16 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
        * makeshlib.sh (alpha-*-osf*): add -expect_unresolved (due to

diff --git a/src/util/makeshlib.sh b/src/util/makeshlib.sh
index 2cab3aeb009d1ce7861e43de418145f9185eb4d5..4507ad269df235fb8b4a02bb880886342a880d7a 100644 (file)
--- a/src/util/makeshlib.sh
+++ b/src/util/makeshlib.sh
@@ -100,37 +100,46 @@ mips-sni-sysv4)
        do
                sed -e "s;^;$i/;" -e "s; ; $i/;g" $i/DONE
        done`
-echo rm $library 
-rm -f $library 2>/dev/null
-ar cq $library $FILES || exit $?
+       echo rm $library 
+       rm -f $library 2>/dev/null
+       echo ar cq $library $FILES
+       ar cq $library $FILES || exit $?
        dump -g $library | sed -e 's/^[         ]*[0-9][0-9]*[  ]*\([^  .][^    ]*\)$/\1/p;d' | sort | uniq > ${library}.syms
        stat=$?
-       if [ $stat -eq 0 ]
-       then
-       if test "$HAVE_GCC" = "yes" ; then
+       if [ $stat -eq 0 ] ; then
+           if test "$HAVE_GCC" = "yes-broken" ; then
+               # yikes!  this part won't handle gnu ld either!
+               # disable it for now.
                $CC -o shr.o.$VERSION $library -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:${library}.syms $ldflags $liblist $libdirfl
-               else ld -o shr.o.$VERSION $library -H512 -T512 -bM:SRE  $ldflags -bfilelist -bgcbypass:1 -bnodelcsect -x -bE:${library}.syms $libdirfl $liblist -lc
-            fi
- stat=$?
-       if [ $stat -eq 0 ]
-             then
-             rm $library ${library}.syms
-             ar cq $library shr.o.$VERSION
-             stat=$?
-             rm shr.o.$VERSION
-            else
-            rm -f $library
-fi
-          fi
-;;
+           else
+               # Pull in by explicit pathname so we don't get gnu ld if
+               # installed (it could be even if we chose not to use gcc).
+               # Better still would be to do this through $CC -- how do
+               # we get crt0.o left out?
+    echo       /bin/ld -o shr.o.$VERSION $library -H512 -T512 -bM:SRE $ldflags -bgcbypass:1 -bnodelcsect -bE:${library}.syms $libdirfl $liblist -lc
+               /bin/ld -o shr.o.$VERSION $library -H512 -T512 -bM:SRE $ldflags -bgcbypass:1 -bnodelcsect -bE:${library}.syms $libdirfl $liblist -lc
+           fi
+           stat=$?
+           if [ $stat -eq 0 ] ; then
+               rm $library ${library}.syms
+               ar cq $library shr.o.$VERSION
+               stat=$?
+               rm shr.o.$VERSION
+           else
+               rm -f $library
+           fi
+       fi
+       ;;
 alpha-*-osf*)
        FILES=`for i 
        do
                sed -e "s;^;$i/;" -e "s; ; $i/;g" $i/DONE
-
        done`
 
-       echo    ld -shared -expect_unresolved \* $ldflags -o $library -all $FILES $libdirfl $liblist -none -lc -update_registry ../../so_locations
+       # The "-expect_unresolved *" argument hides the fact that we don't
+       # provide the (static) db library when building the (dynamic) kadm5
+       # libraries.
+       echo ld -shared -expect_unresolved \* $ldflags -o $library -all $FILES $libdirfl $liblist -none -lc -update_registry ../../so_locations
        ld -shared -expect_unresolved \* $ldflags -o $library -all $FILES $libdirfl $liblist -none -lc -update_registry ../../so_locations
        stat=$?
        ;;