aboutsummaryrefslogtreecommitdiff
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:57:48 -0500
commit0edc2375808af87b9d890918c616c514de502e98 (patch)
tree604bfc4a714832a6cb23bfdbe950180b83c9ead0
parent6aa98e957924ed3a82877186567f3593da4cf6e0 (diff)
downloadpostgresql-0edc2375808af87b9d890918c616c514de502e98.tar.gz
postgresql-0edc2375808af87b9d890918c616c514de502e98.zip
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.
-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 8fd6cd40151..6fd1436bba6 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -246,6 +246,8 @@ sub fetchRegressOpts
my $m = <$handle>;
close($handle);
my @opts;
+
+ $m =~ s{\\\r?\n}{}g;
if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
{