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

nmisch · nmisch · commit a59b3428efa7 · 2017-12-08T18:04:45.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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -519,10 +519,10 @@ sub mkvcbuild`
`519`	`519`
`520`	`520`	`# Add defines from Perl's ccflags; see PGAC_CHECK_PERL_EMBED_CCFLAGS`
`521`	`521`	`my @perl_embed_ccflags;`
`522`		`- foreach my $f (split(" ",$Config{ccflags}))`
	`522`	`+ foreach my $f (split(" ", $Config{ccflags}))`
`523`	`523`	`{`
`524`		`- if ($f =~ /^-D[^_]/ \|\|`
`525`		`- $f =~ /^-D_USE_32BIT_TIME_T/)`
	`524`	`+ if ( $f =~ /^-D[^_]/`
	`525`	`+ \|\| $f =~ /^-D_USE_32BIT_TIME_T/)`
`526`	`526`	`{`
`527`	`527`	`$f =~ s/\-D//;`
`528`	`528`	`push(@perl_embed_ccflags, $f);`
`@@ -624,7 +624,8 @@ sub mkvcbuild`
`624`	`624`	`}`
`625`	`625`	`else`
`626`	`626`	`{`
`627`		`- die "could not identify perl library version";`
	`627`	`+ die`
	`628`	`+"could not identify perl library version matching pattern $perl_path\n";`
`628`	`629`	`}`
`629`	`630`
`630`	`631`	`# Add transform module dependent on plperl`