[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1c9858d0d013184ff756d063022161b1853a9cbf (commit)
      from  ab9c0d28610ce4ed4185bae325b03e2da5dd76fe (commit)


- Log -----------------------------------------------------------------
commit 1c9858d0d013184ff756d063022161b1853a9cbf
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 3 23:07:14 2018 +0100

    Windows makefile: Don't quote generator arguments
    
    Rely on the build.info constructor to do the right thing.
    
    Fixes #5500
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5501)

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

Summary of changes:
 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 2f6426d..dd0c849 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -406,7 +406,8 @@ reconfigure reconf:
   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}} ?