summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-07 22:40:32 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-08 05:10:46 +0100
commit22626b972c024d5ae9922e4a9d710a5f9e51f753 (patch)
tree431bbd18df00912a5fc71340ba28650a462e8295
parent4af26979480a42e267ff686210bb63b1ebdd0eab (diff)
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)
-rw-r--r--Configurations/windows-makefile.tmpl2
1 files changed, 1 insertions, 1 deletions
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";
}
'';
-}