[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ecc347f5f53a9f2edc2805d50cba07db64267e8a (commit)
      from  60690b5b8396d7d5234cd067206190fb8aca78d2 (commit)


- Log -----------------------------------------------------------------
commit ecc347f5f53a9f2edc2805d50cba07db64267e8a
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Oct 23 10:35:48 2018 +0200

    Windows build: build foo.d after foo.obj
    
    We made the build of foo.obj depend on foo.d, meaning the latter gets
    built first.  Unfortunately, the way the compiler works, we are forced
    to redirect all output to foo.d, meaning that if the source contains
    an error, the build fails without showing those errors.
    
    We therefore remove the dependency and force the build of foo.d to
    always happen after build of foo.obj.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7469)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 44cc7d0..c4987f2 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -615,16 +615,14 @@ $obj$objext: $deps
 	\$(CC) /EP /D__ASSEMBLER__ $cflags $srcs > \$@.asm && \$(AS) $asflags \$(ASOUTFLAG)\$\@ \$@.asm
 EOF
      }
-     return <<"EOF"	if (!$disabled{makedepend});
-$obj$depext: $deps
-	\$(CC) $cflags /Zs /showIncludes $srcs 2>&1 > $obj$depext
-$obj$objext: $obj$depext
-	\$(CC) $cflags -c \$(COUTFLAG)\$\@ $srcs
-EOF
-    return <<"EOF"	if ($disabled{makedepend});
+     my $recipe = <<"EOF";
 $obj$objext: $deps
 	\$(CC) $cflags -c \$(COUTFLAG)\$\@ $srcs
 EOF
+     $recipe .= <<"EOF"	unless $disabled{makedepend};
+	\$(CC) $cflags /Zs /showIncludes $srcs 2>&1 > $obj$depext
+EOF
+     return $recipe;
  }
 
  # We *know* this routine is only called when we've configure 'shared'.