From: Richard Levitte <levitte@openssl.org>
Date: Thu, 15 Mar 2018 20:37:32 +0000 (+0100)
Subject: Windows makefile: don't use different looking variants of same cmd
X-Git-Tag: OpenSSL_1_1_0h~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=41613420b83f88ee37e297aa142f8593c74e12db;p=oweals%2Fopenssl.git

Windows makefile: don't use different looking variants of same cmd

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5635)

(cherry picked from commit ad3350a90b81275ed2357cad0b9d435d6077bf9d)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 49d6037130..e3e213f610 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