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: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10514)

diff --git a/configdata.pm.in b/configdata.pm.in
index 6e5c1ad4f674c42099f43aeabd6e4a0052d79089..312122686f4da4d06ce52bd00991a71b718b8b89 100644 (file)
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -124,8 +124,6 @@ unless (caller) {
         my $prepend = <<"_____";
 use File::Spec::Functions;
 use lib '{- sourcedir('util', 'perl') -}';
-_____
-        $prepend .= <<"_____" if defined $target{perl_platform};
 use lib '{- sourcedir('Configurations') -}';
 use lib '{- $config{builddir} -}';
 use platform;

diff --git a/util/dofile.pl b/util/dofile.pl
index a82b987eba9c5dc18a58379c86a033ad392a23f6..57243880d414e62fe94e41551ffae8f2eaa849cc 100644 (file)
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -63,8 +63,6 @@ sub errorcallback {
 
 my $prepend = <<"_____";
 use File::Spec::Functions;
-_____
-$prepend .= <<"_____" if defined $target{perl_platform};
 use lib "$FindBin::Bin/../Configurations";
 use lib '$config{builddir}';
 use platform;