Commit 7240962f authored by Magnus Hagander's avatar Magnus Hagander

Fix msvc builds for ActivePerl > 5.24

From this version ActivePerl ships both a .lib and a .a file for the
perl library, which our code would detect as there being no library
available. Instead, we should pick the .lib version and use that.

Report and suggested fix in bug #15065

Author: Heath Lord
parent 17b340ab
...@@ -524,9 +524,11 @@ sub mkvcbuild ...@@ -524,9 +524,11 @@ sub mkvcbuild
my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*'; my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a # ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
# Starting with ActivePerl 5.24, both perlnn.lib and libperlnn.a are provided.
# In this case, prefer .lib.
my @perl_libs = my @perl_libs =
grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path); grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
if (@perl_libs == 1) if (@perl_libs > 0)
{ {
$plperl->AddLibrary($perl_libs[0]); $plperl->AddLibrary($perl_libs[0]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment