From d237d6991461ae55b22df22b42d4771d8ea1b261 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 6 Apr 2016 17:27:01 +0200 Subject: [PATCH] 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 --- Configurations/windows-makefile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.25.1