Commit 685b6f29 authored by Richard Levitte's avatar Richard Levitte
Browse files

When building DLLs, hack the library name in the .def file 



util/mkdef.pl assumes it knows what the resulting library name will
be.  Really, it shouldn't, but changing it will break classic native
Windows builds, so we leave it for now and change the LIBRARY line
externally when needed instead.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 8975fb62

Configurations/windows-makefile.tmpl

+7 −1
Original line number Diff line number Diff line
@@ -282,12 +282,18 @@ EOF 
			    rel2abs($config{builddir}));

     my $target = shlib_import($lib);

     return <<"EOF"

$target: $deps $ordinalsfile

$target: $deps $ordinalsfile $mkdef_pl

	\$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def

	\$(PERL) -i.tmp -pe "s|^LIBRARY\\s+${mkdef_key}32|LIBRARY $shlib|;" $shlib.def

	DEL $shlib.def.tmp

	\$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\

		/implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<<

$objs$linklibs \$(EX_LIBS)

<<

	DEL /F apps\\$shlib$shlibext

	DEL /F test\\$shlib$shlibext

	COPY $shlib$shlibext apps

	COPY $shlib$shlibext test

EOF

 }

 sub obj2dso {