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

nmisch · nmisch · commit 85a83a3cc69f · 2017-12-08T18:05:13.000-08:00
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -511,10 +511,10 @@ sub mkvcbuild`
`511`	`511`
`512`	`512`	`# Add defines from Perl's ccflags; see PGAC_CHECK_PERL_EMBED_CCFLAGS`
`513`	`513`	`my @perl_embed_ccflags;`
`514`		`- foreach my $f (split(" ",$Config{ccflags}))`
	`514`	`+ foreach my $f (split(" ", $Config{ccflags}))`
`515`	`515`	`{`
`516`		`- if ($f =~ /^-D[^_]/ \|\|`
`517`		`- $f =~ /^-D_USE_32BIT_TIME_T/)`
	`516`	`+ if ( $f =~ /^-D[^_]/`
	`517`	`+ \|\| $f =~ /^-D_USE_32BIT_TIME_T/)`
`518`	`518`	`{`
`519`	`519`	`$f =~ s/\-D//;`
`520`	`520`	`push(@perl_embed_ccflags, $f);`
`@@ -616,7 +616,8 @@ sub mkvcbuild`
`616`	`616`	`}`
`617`	`617`	`else`
`618`	`618`	`{`
`619`		`- die "could not identify perl library version";`
	`619`	`+ die`
	`620`	`+"could not identify perl library version matching pattern $perl_path\n";`
`620`	`621`	`}`
`621`	`622`
`622`	`623`	`# Add transform module dependent on plperl`