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:47 -0500
commitd710116c64ba8971fd48a09e54bf4ba9fcb4a6ca (patch)
tree29996348c97825ac0823a2bba422f5d6ae789fc9 /src
parenta652b0c78c4f4bca8862a21aa8bba7ec35e305aa (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 6eb7cfc8b82..853d60ff05f 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -330,6 +330,8 @@ sub fetchRegressOpts
my $m = <$handle>;
close($handle);
my @opts;
+
+ $m =~ s{\\\r?\n}{}g;
if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
{