From e9e28ddc4ed3d047d397424735373a572efd5e60 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 3 Mar 2018 23:07:14 +0100 Subject: [PATCH] Windows makefile: Don't quote generator arguments Rely on the build.info constructor to do the right thing. Fixes #5500 Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/5501) (cherry picked from commit 1c9858d0d013184ff756d063022161b1853a9cbf) --- Configurations/windows-makefile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index d90174a845..49d6037130 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -369,7 +369,8 @@ configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{b sub generatesrc { my %args = @_; (my $target = $args{src}) =~ s/\.[sS]$/.asm/; - my $generator = '"'.join('" "', @{$args{generator}}).'"'; + my ($gen0, @gens) = @{$args{generator}}; + my $generator = '"'.$gen0.'"'.join('', map { " $_" } @gens); my $generator_incs = join("", map { " -I \"$_\"" } @{$args{generator_incs}}); my $incs = join("", map { " /I \"$_\"" } @{$args{incs}}); my $deps = @{$args{deps}} ? -- 2.25.1