diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-04-06 17:27:01 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-04-07 21:12:10 +0200 |
| commit | d237d6991461ae55b22df22b42d4771d8ea1b261 (patch) | |
| tree | fcd41612846982c0e6ebf393201728927db57650 | |
| parent | 02b91dcf1cdd2fc75ecdb47d2fba2936e840ed3c (diff) | |
| download | openssl-d237d6991461ae55b22df22b42d4771d8ea1b261.tar.gz | |
windows-makefile.tmpl: clean up after DLL link failure.
Without proper cleanup after DLL link failure second attempt to
run nmake would actually proceed and failure will be "shifted" to
run time. This is because libcrypto.lib import library is generated
even if DLL link fails.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index b4672ab791..c67ff83af4 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -360,7 +360,7 @@ $target: $deps $ordinalsfile $mkdef_pl \$(PERL) $mkrc_pl $shlib$shlibext > $shlib.rc \$(RC) \$(RCOUTFLAG)$shlib.res $shlib.rc \$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\ - /implib:$target \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< + /implib:\$@ \$(LDOUTFLAG)$shlib$shlibext /def:$shlib.def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1) $objs $shlib.res$linklibs \$(EX_LIBS) << DEL /F apps\\$shlib$shlibext |