summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2014-12-18 03:55:17 -0500
committerNoah Misch <noah@leadboat.com>2014-12-18 03:55:43 -0500
commita47f38e526f70b397c1941f331e729e5fab95d27 (patch)
treeda4567daad53176d70939f0b7e0159c12f146700 /src
parent2ab19ce5e3799cd2bb031212af76f463eee0bc1c (diff)
Recognize Makefile line continuations in fetchRegressOpts().
Back-patch to 9.0 (all supported versions). This is mere future-proofing in the context of the master branch, but commit f6dc6dd5ba54d52c0733aaafc50da2fbaeabb8b0 requires it of older branches.
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/vcregress.pl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 30da0ba0e65..244c2b127a0 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -333,6 +333,8 @@ sub fetchRegressOpts
my $m = <$handle>;
close($handle);
my @opts;
+
+ $m =~ s{\\\r?\n}{}g;
if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
{