Commit 1df92eea authored by Andrew Dunstan's avatar Andrew Dunstan

Fix perl searchpath for modern perl for MSVC tools

Modern versions of perl no longer include the current directory in the
perl searchpath, as it's insecure. Instead of adding the current
directory, we get around the problem by adding the directory where the
script lives.

Problem noted by Victor Wagner.

Solution adapted from buildfarm client code.

Backpatch to all live versions.
parent 5953c996
......@@ -6,6 +6,10 @@
use strict;
use warnings;
use File::Basename;
use File::Spec;
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Install qw(Install);
# buildenv.pl is for specifying the build environment settings
......
......@@ -7,6 +7,10 @@
use strict;
use warnings;
use File::Basename;
use File::Spec;
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Mkvcbuild;
chdir('..\..\..') if (-d '..\msvc' && -d '..\..\..\src');
......
......@@ -11,6 +11,8 @@ use File::Basename;
use File::Copy;
use File::Find ();
use File::Path qw(rmtree);
use File::Spec;
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Install qw(Install);
......
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