From: Noah Misch <noah@leadboat.com>
Date: Thu, 18 Dec 2014 08:55:17 +0000 (-0500)
Subject: Recognize Makefile line continuations in fetchRegressOpts().
X-Git-Tag: REL9_1_15~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0edc2375808af87b9d890918c616c514de502e98;p=thirdparty%2Fpostgresql.git

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.
---

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)
     {