mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
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: Matt Caswell <matt@openssl.org>
This commit is contained in:
parent
8975fb6212
commit
685b6f293b
@ -282,12 +282,18 @@ EOF
|
|||||||
rel2abs($config{builddir}));
|
rel2abs($config{builddir}));
|
||||||
my $target = shlib_import($lib);
|
my $target = shlib_import($lib);
|
||||||
return <<"EOF"
|
return <<"EOF"
|
||||||
$target: $deps $ordinalsfile
|
$target: $deps $ordinalsfile $mkdef_pl
|
||||||
\$(PERL) $mkdef_pl "$mkdef_key" 32 > $shlib.def
|
\$(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) \\
|
\$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
|
||||||
/implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<<
|
/implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<<
|
||||||
$objs$linklibs \$(EX_LIBS)
|
$objs$linklibs \$(EX_LIBS)
|
||||||
<<
|
<<
|
||||||
|
DEL /F apps\\$shlib$shlibext
|
||||||
|
DEL /F test\\$shlib$shlibext
|
||||||
|
COPY $shlib$shlibext apps
|
||||||
|
COPY $shlib$shlibext test
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
sub obj2dso {
|
sub obj2dso {
|
||||||
|
Loading…
Reference in New Issue
Block a user