From 85a83a3cc69f72fa779eceea400b44efd7c26fa7 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 8 Dec 2017 18:04:45 -0800
Subject: [PATCH] MSVC: Remove cosmetic, cross-branch differences pertaining to
Perl.
This simplifies back-patch of the next change to v9.5 and v9.6.
---
src/tools/msvc/Mkvcbuild.pm | 9 +++++----
1 file 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