aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-03-03 23:07:14 +0100
committerRichard Levitte <levitte@openssl.org>2018-03-03 23:08:43 +0100
commit1c9858d0d013184ff756d063022161b1853a9cbf (patch)
treed7c1287f795c7f6aad62a0e308a0f0cbae6520f8
parentab9c0d28610ce4ed4185bae325b03e2da5dd76fe (diff)
downloadopenssl-1c9858d0d013184ff756d063022161b1853a9cbf.zip
openssl-1c9858d0d013184ff756d063022161b1853a9cbf.tar.gz
openssl-1c9858d0d013184ff756d063022161b1853a9cbf.tar.bz2
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@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5501)
-rw-r--r--Configurations/windows-makefile.tmpl3
1 files changed, 2 insertions, 1 deletions
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}} ?