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:55:17 -0500
commit43b56171b1fbcba8a6309de755545e3c63ac25dd (patch)
treecb376686436fd8613fd6d8ee544c448262149ab2
parent26674c923d0ecbac2cda039433163d17584fae65 (diff)
downloadpostgresql-43b56171b1fbcba8a6309de755545e3c63ac25dd.tar.gz
postgresql-43b56171b1fbcba8a6309de755545e3c63ac25dd.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 f9b4f3c352c..bd3dd2ca1e1 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -338,6 +338,8 @@ sub fetchRegressOpts
my $m = <$handle>;
close($handle);
my @opts;
+
+ $m =~ s{\\\r?\n}{}g;
if ($m =~ /^\s*REGRESS_OPTS\s*=(.*)/m)
{