aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2018-03-04 18:00:16 +0100
committerMagnus Hagander <magnus@hagander.net>2018-03-04 18:01:25 +0100
commit6946280cded903b6f5269fcce105f8ab1d455d33 (patch)
treeaead29df1e88a4e0a889e54f6e9d5df28c93a8a5
parentf7c7f67fecc40170a2fad2d1cff24dd1ddd22d7f (diff)
downloadpostgresql-6946280cded903b6f5269fcce105f8ab1d455d33.tar.gz
postgresql-6946280cded903b6f5269fcce105f8ab1d455d33.zip
Actually pick .lib file when multiple perl libs are present
7240962f8626ff09bb8f9e71ecdb074775bdd035 got it right in the comment, but the code did not actually do what the comment said. Fix that. Issue pointed out by Noah Misch.
-rw-r--r--src/tools/msvc/Mkvcbuild.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 123292f48d8..72976f44d8e 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -527,7 +527,7 @@ sub mkvcbuild
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
# In this case, prefer .lib.
my @perl_libs =
- grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
+ reverse sort grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
if (@perl_libs > 0)
{
$plperl->AddLibrary($perl_libs[0]);