]> granicus.if.org Git - postgresql/commitdiff
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:04:45 +0000 (18:04 -0800)
This simplifies back-patch of the next change to v9.5 and v9.6.

src/tools/msvc/Mkvcbuild.pm

index 52b1ec2d344b3e79c6f6d2a0cec182c444958d42..90acde4a64e5af9818a682a38a4837b250001f7e 100644 (file)
@@ -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