pullup from trunk

ticket: 3042
version_fixed: 1.4.2

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17305 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/aes/ChangeLog b/src/lib/crypto/aes/ChangeLog
index c02a4f87d550e35ea18a0d8f4f3af4891a5059e3..c3d78107a57167a53b73cea629c94c9421a7d5a4 100644 (file)
--- a/src/lib/crypto/aes/ChangeLog
+++ b/src/lib/crypto/aes/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-03  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (aes-gen): Use CC_LINK.  Reported by Mike Friedman.
+
 2004-09-28  Ken Raeburn  <raeburn@mit.edu>
 
        * vbaxam.doc: File deleted.

diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in
index ce3e4bdbdf5c755a705a03af819dc0842a658475..dd93281a08c638c78397c8569d222671f3ed0601 100644 (file)
--- a/src/lib/crypto/aes/Makefile.in
+++ b/src/lib/crypto/aes/Makefile.in
@@ -45,7 +45,7 @@ includes:: depend
 depend:: $(SRCS)
 
 aes-gen: aes-gen.o $(GEN_OBJS)
-       $(CC) -o aes-gen aes-gen.o $(GEN_OBJS)
+       $(CC_LINK) -o aes-gen aes-gen.o $(GEN_OBJS)
 
 run-aes-gen: aes-gen
        ./aes-gen > kresults.out