Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
MSVC: Remove cosmetic, cross-branch differences pertaining to Perl.
authorNoah Misch <noah@leadboat.com>
Sat, 9 Dec 2017 02:04:45 +0000 (18:04 -0800)
committerNoah Misch <noah@leadboat.com>
Sat, 9 Dec 2017 02:05:13 +0000 (18:05 -0800)
This simplifies back-patch of the next change to v9.5 and v9.6.

src/tools/msvc/Mkvcbuild.pm

index 92374e23166f0f77bbcdfb44f394d87b7129190a..a9d8bfab9e41c0e1ca0ed5765c800de896a6040b 100644 (file)
@@ -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