aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2017-12-08 18:04:45 -0800
committerNoah Misch <noah@leadboat.com>2017-12-08 18:05:13 -0800
commit85a83a3cc69f72fa779eceea400b44efd7c26fa7 (patch)
tree44725fb774822e6c67c5366e62f6b13461dad7a3
parent340a67a32d5a872a458d53acb604fc9fd2b5019a (diff)
downloadpostgresql-85a83a3cc69f72fa779eceea400b44efd7c26fa7.tar.gz
postgresql-85a83a3cc69f72fa779eceea400b44efd7c26fa7.zip
MSVC: Remove cosmetic, cross-branch differences pertaining to Perl.
This simplifies back-patch of the next change to v9.5 and v9.6.
-rw-r--r--src/tools/msvc/Mkvcbuild.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 92374e23166..a9d8bfab9e4 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -511,10 +511,10 @@ sub mkvcbuild
# Add defines from Perl's ccflags; see PGAC_CHECK_PERL_EMBED_CCFLAGS
my @perl_embed_ccflags;
- foreach my $f (split(" ",$Config{ccflags}))
+ foreach my $f (split(" ", $Config{ccflags}))
{
- if ($f =~ /^-D[^_]/ ||
- $f =~ /^-D_USE_32BIT_TIME_T/)
+ if ( $f =~ /^-D[^_]/
+ || $f =~ /^-D_USE_32BIT_TIME_T/)
{
$f =~ s/\-D//;
push(@perl_embed_ccflags, $f);
@@ -616,7 +616,8 @@ sub mkvcbuild
}
else
{
- die "could not identify perl library version";
+ die
+"could not identify perl library version matching pattern $perl_path\n";
}
# Add transform module dependent on plperl