Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1df92ee

Browse files
committed
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.
1 parent 5953c99 commit 1df92ee

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

src/tools/msvc/install.pl

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
use strict;
77
use warnings;
88

9+
use File::Basename;
10+
use File::Spec;
11+
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
12+
913
use Install qw(Install);
1014

1115
# buildenv.pl is for specifying the build environment settings

src/tools/msvc/mkvcbuild.pl

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
use strict;
88
use warnings;
99

10+
use File::Basename;
11+
use File::Spec;
12+
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
13+
1014
use Mkvcbuild;
1115

1216
chdir('..\..\..') if (-d '..\msvc' && -d '..\..\..\src');

src/tools/msvc/vcregress.pl

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use File::Copy;
1212
use File::Find ();
1313
use File::Path qw(rmtree);
14+
use File::Spec;
15+
BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
1416

1517
use Install qw(Install);
1618

0 commit comments

Comments
 (0)