diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-16 16:50:18 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-16 18:11:13 +0100 |
| commit | 685b6f293b4b29bf1ee5c7af19cf1348567828b4 (patch) | |
| tree | 3aadcfb85a864688173003e11e35a4cb828352cf | |
| parent | 8975fb62122250440e9bc00c6e985e3a708473bb (diff) | |
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>
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index cb1b4e696d..7a6a58f44b 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -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 { |