[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  22626b972c024d5ae9922e4a9d710a5f9e51f753 (commit)
      from  4af26979480a42e267ff686210bb63b1ebdd0eab (commit)


- Log -----------------------------------------------------------------
commit 22626b972c024d5ae9922e4a9d710a5f9e51f753
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 7 22:40:32 2018 +0100

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5278)

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

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index b135502..0abe6ea 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";
  }
  '';
 -}