[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Richard Levitte
levitte at openssl.org
Sun Mar 4 08:44:12 UTC 2018
The branch OpenSSL_1_1_0-stable has been updated
via e9e28ddc4ed3d047d397424735373a572efd5e60 (commit)
from d4d3e906824dabd98bdc6c76eab5a3abdfb7bb13 (commit)
- Log -----------------------------------------------------------------
commit e9e28ddc4ed3d047d397424735373a572efd5e60
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)
(cherry picked from commit 1c9858d0d013184ff756d063022161b1853a9cbf)
-----------------------------------------------------------------------
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 d90174a..49d6037 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}} ?
More information about the openssl-commits
mailing list