summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2018-10-28 16:22:32 +0000
committerAndrew Dunstan2018-10-28 16:25:56 +0000
commit9fd6d4eae3009658d0d941262f7dec5ca9b877c1 (patch)
tree442f692d3c73ab084285fc67751358ef35209c04
parent6889428769255253cbbaaf1113474382b59a2f1c (diff)
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.
-rwxr-xr-xsrc/tools/msvc/install.pl4
-rw-r--r--src/tools/msvc/mkvcbuild.pl4
-rw-r--r--src/tools/msvc/vcregress.pl2
3 files changed, 10 insertions, 0 deletions
diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl
index bde5b7c793a..d7b7c7ee615 100755
--- a/src/tools/msvc/install.pl
+++ b/src/tools/msvc/install.pl
@@ -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
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index 6f1c42e5044..748b0eb4156 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -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');
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 64428ac7c39..3462144731f 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -10,6 +10,8 @@ use Cwd;
use File::Basename;
use File::Copy;
use File::Find ();
+use File::Spec;
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
use Install qw(Install);