[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  0d9b5fa3b44794c6830641f6cf2e6d840d1e9315 (commit)
      from  73cc84a132a08a02253ae168600fc4d16cd400d8 (commit)


- Log -----------------------------------------------------------------
commit 0d9b5fa3b44794c6830641f6cf2e6d840d1e9315
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 14 17:06:04 2018 +0200

    windows-makefile.tmpl: delete export library prior link.
    
    LINK can outsmart itself and choose to not update export .lib upon
    corresponding .dll re-link. Since dependency is between .lib and all
    .obj-s, re-compilation of any .obj makes NMAKE relink .dll and all
    .exe-s over and over...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/windows-makefile.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 0752bbe..49af571 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -627,6 +627,7 @@ EOF
      return <<"EOF"
 $target: $deps
 	IF EXIST $shlib$shlibext.manifest DEL /F /Q $shlib$shlibext.manifest
+	IF EXIST \$@ DEL /F /Q \$@
 	\$(LD) \$(LDFLAGS) \$(LIB_LDFLAGS) \\
 		/implib:\$@ \$(LDOUTFLAG)$shlib$shlibext$shared_def @<< || (DEL /Q \$(\@B).* $shlib.* && EXIT 1)
 $objs