diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2019-10-04 15:34:40 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2019-10-04 15:39:12 -0400 |
| commit | 62d2caed62348994fb83cb105fcd2f4a247f5440 (patch) | |
| tree | 2e66438eee5467ab3e777fe359661d9cf6ff00ff /src | |
| parent | 9faa9794f885bd27bbb2c1f0a287d5efa8437ade (diff) | |
Handle spaces in OpenSSL install location for MSVC
First, make sure that the .exe name is quoted when trying to get the
version number. Also, don't quote the lib name for using in the project
files if it's already been quoted. This second change applies to all
libraries, not just OpenSSL.
This has clearly been broken forever, so backpatch to all live branches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Project.pm | 3 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index 9817b9439a9..1c9a8cda5c4 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -126,7 +126,8 @@ sub AddLibrary { my ($self, $lib, $dbgsuffix) = @_; - if ($lib =~ m/\s/) + # quote lib name if it has spaces and isn't already quoted + if ($lib =~ m/\s/ && $lib !~ m/^[&]quot;/) { $lib = '"' . $lib . """; } diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index cb0edd387b6..06b479eced0 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -124,8 +124,9 @@ sub GetOpenSSLVersion # Attempt to get OpenSSL version and location. This assumes that # openssl.exe is in the specified directory. + # Quote the .exe name in case it has spaces my $opensslcmd = - $self->{options}->{openssl} . "\\bin\\openssl.exe version 2>&1"; + qq("$self->{options}->{openssl}\\bin\\openssl.exe" version 2>&1); my $sslout = `$opensslcmd`; $? >> 8 == 0 |