提交 fbd03b1c 编写于 作者: R Richard Levitte

configdata.pm.in, util/dofile.pl: load 'platform' unconditionally

The 'platform' module handles defaults fine, there's no need to add
extra conditions on it being loaded.

Fixes #10513
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10514)
上级 e9b95e42
...@@ -124,8 +124,6 @@ unless (caller) { ...@@ -124,8 +124,6 @@ unless (caller) {
my $prepend = <<"_____"; my $prepend = <<"_____";
use File::Spec::Functions; use File::Spec::Functions;
use lib '{- sourcedir('util', 'perl') -}'; use lib '{- sourcedir('util', 'perl') -}';
_____
$prepend .= <<"_____" if defined $target{perl_platform};
use lib '{- sourcedir('Configurations') -}'; use lib '{- sourcedir('Configurations') -}';
use lib '{- $config{builddir} -}'; use lib '{- $config{builddir} -}';
use platform; use platform;
......
...@@ -63,8 +63,6 @@ sub errorcallback { ...@@ -63,8 +63,6 @@ sub errorcallback {
my $prepend = <<"_____"; my $prepend = <<"_____";
use File::Spec::Functions; use File::Spec::Functions;
_____
$prepend .= <<"_____" if defined $target{perl_platform};
use lib "$FindBin::Bin/../Configurations"; use lib "$FindBin::Bin/../Configurations";
use lib '$config{builddir}'; use lib '$config{builddir}';
use platform; use platform;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册