aboutsummaryrefslogtreecommitdiff
path: root/src/tools/msvc/Solution.pm
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2014-07-14 14:07:27 -0400
committerNoah Misch <noah@leadboat.com>2014-07-14 14:07:27 -0400
commit35d19a9a37c245ff7c640743f37b8df227fd24dc (patch)
tree1c6583feb9340b8b2ad75ebbbf2cf915b6793f6f /src/tools/msvc/Solution.pm
parent91f03ba5cf88b393bf2509f3f00dd00437a5bd54 (diff)
downloadpostgresql-35d19a9a37c245ff7c640743f37b8df227fd24dc.tar.gz
postgresql-35d19a9a37c245ff7c640743f37b8df227fd24dc.zip
MSVC: Process Makefile line continuations more like "make" does.
Unlike "make" itself, the MSVC build process recognized a continuation even with whitespace after the backslash. (Due to a typo, some code sites accepted the letter "s" instead of whitespace). Also, it would consume any number of newlines following a single backslash. This is mere cleanup; those behaviors were unlikely to cause bugs.
Diffstat (limited to 'src/tools/msvc/Solution.pm')
-rw-r--r--src/tools/msvc/Solution.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 89e4b07c801..e49c3f4275f 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -422,7 +422,7 @@ EOF
}
my $mf = Project::read_file('src\backend\catalog\Makefile');
- $mf =~ s{\\s*[\r\n]+}{}mg;
+ $mf =~ s{\\\r?\n}{}g;
$mf =~ /^POSTGRES_BKI_SRCS\s*:?=[^,]+,(.*)\)$/gm
|| croak "Could not find POSTGRES_BKI_SRCS in Makefile\n";
my @allbki = split /\s+/, $1;