From: Noah Misch <noah@leadboat.com>
Date: Sat, 9 Dec 2017 02:04:45 +0000 (-0800)
Subject: MSVC: Remove cosmetic, cross-branch differences pertaining to Perl.
X-Git-Tag: REL9_6_7~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a59b3428efa79a699b87355eb859877f205fb33d;p=postgresql

MSVC: Remove cosmetic, cross-branch differences pertaining to Perl.

This simplifies back-patch of the next change to v9.5 and v9.6.
---

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 52b1ec2d34..90acde4a64 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -519,10 +519,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);
@@ -624,7 +624,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