summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-10-11 01:47:09 +0000
committerTheodore Tso <tytso@mit.edu>1995-10-11 01:47:09 +0000
commitf5b6b73be5058d8b6acab5ea7b05f9e96a3b0f2c (patch)
treea1fe744cc3f66bcb07ef80f5251f43e4c2b6956f /src
parent2055c022c5d5ac855deb9d9cbb8df1ed70d04dad (diff)
downloadkrb5-f5b6b73be5058d8b6acab5ea7b05f9e96a3b0f2c.tar.gz
krb5-f5b6b73be5058d8b6acab5ea7b05f9e96a3b0f2c.tar.xz
krb5-f5b6b73be5058d8b6acab5ea7b05f9e96a3b0f2c.zip
Added the "/nod" option to the gssapi.dll and libkrb5.dll linker
commands. This prevents the linker from searching the llibcew.lib library for some externals which are already in ldllcew.lib. This is what we want since we are building a DLL. Without the "/nod" option we get a bunch of duplicate definitions. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6959 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/ChangeLog9
-rw-r--r--src/lib/Makefile.in4
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 7cc1f6dca1..6f22f64759 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct 10 21:45:51 1995 Theodore Y. Ts'o <tytso@dcl>
+
+ * Makefile.in: Added the "/nod" option to the gssapi.dll and
+ libkrb5.dll linker commands. This prevents the linker
+ from searching the llibcew.lib library for some externals
+ which are already in ldllcew.lib. This is what we want
+ since we are building a DLL. Without the "/nod" option we
+ get a bunch of duplicate definitions.
+
Fri Sep 29 14:19:44 1995 Theodore Y. Ts'o <tytso@dcl>
* Makefile.in (CLEANLIBS): Clean up make clean procedures. The
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 60a4770be6..84dcfd65a7 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -38,7 +38,7 @@ gssapi.lib:: gssapi.dll
implib /nologo gssapi.lib gssapi.dll
gssapi.dll:: $(GLIB) $(LIBS) gssapi.def
- link /co /seg:400 /noe /nol win_glue, gssapi.dll, gssapi.map, \
+ link /co /seg:400 /noe /nod /nol win_glue, gssapi.dll, gssapi.map, \
$(LIBS) ldllcew libw, gssapi.def
rc /nologo /p /k gssapi.dll
@@ -46,7 +46,7 @@ libkrb5.lib:: libkrb5.dll
implib /nologo libkrb5.lib libkrb5.dll
libkrb5.dll:: $(LIBS) libkrb5.def win_glue.obj
- link /co /seg:400 /noe /nol win_glue, libkrb5.dll, libkrb5.map, \
+ link /co /seg:400 /noe /nod /nol win_glue, libkrb5.dll, libkrb5.map, \
$(LIBS) ldllcew libw, libkrb5.def
rc /nologo /p /k libkrb5.dll