From: Richard Levitte <levitte@openssl.org>
Date: Mon, 25 Nov 2019 11:53:19 +0000 (+0100)
Subject: configdata.pm.in, util/dofile.pl: load 'platform' unconditionally
X-Git-Tag: openssl-3.0.0-alpha1~898
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fbd03b1c5984d1dd42ef99e1a5da70ed587f3380;p=oweals%2Fopenssl.git

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 6e5c1ad4f6..312122686f 100644
--- 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 a82b987eba..57243880d4 100644
--- 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;