[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

Richard Levitte levitte at openssl.org
Thu Mar 15 21:23:55 UTC 2018


The branch OpenSSL_1_1_0-stable has been updated
       via  41613420b83f88ee37e297aa142f8593c74e12db (commit)
      from  6403471dc838572d4fd1e1609a81a999f0d71b2f (commit)


- Log -----------------------------------------------------------------
commit 41613420b83f88ee37e297aa142f8593c74e12db
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 15 21:37:32 2018 +0100

    Windows makefile: don't use different looking variants of same cmd
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5635)
    
    (cherry picked from commit ad3350a90b81275ed2357cad0b9d435d6077bf9d)

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

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 49d6037..e3e213f 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -460,9 +460,7 @@ s/^Note: including file: *//;
 END { print '$obj$objext: ',join(" ", sort keys \%collect),"\\n" }
 <<
 $obj$objext: $obj$depext
-	\$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ @<<
-$srcs
-<<
+	\$(CC) $incs \$(CFLAGS) $ecflags -c \$(COUTFLAG)\$\@ $srcs
 EOF
     return <<"EOF"	if ($disabled{makedepend});
 $obj$objext: $deps


More information about the openssl-commits mailing list