From: Richard Levitte <levitte@openssl.org>
Date: Wed, 7 Feb 2018 21:40:32 +0000 (+0100)
Subject: With nmake, invoking $(MAKE) needs /$(MAKEFLAGS)
X-Git-Tag: OpenSSL_1_1_1-pre1~33
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22626b972c024d5ae9922e4a9d710a5f9e51f753;p=oweals%2Fopenssl.git

With nmake, invoking $(MAKE) needs /$(MAKEFLAGS)

The slash should be there according to Microsoft documentation,
see https://msdn.microsoft.com/en-us/library/7cafx990.aspx

Fixes #5277

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5278)
---

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index b135502c52..0abe6eaa53 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -59,7 +59,7 @@
  sub dependmagic {
      my $target = shift;
 
-     return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+     return "$target: build_generated\n\t\$(MAKE) /\$(MAKEFLAGS) depend && \$(MAKE) /\$(MAKEFLAGS) _$target\n_$target";
  }
  '';
 -}