summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-09-29 10:31:56 +0200
committerRichard Levitte <levitte@openssl.org>2020-09-29 16:08:04 +0200
commite1f5a92df4b612de8eac7ca538ef44f4b1deec5a (patch)
treed70a1ddf277dec5cba545a05752498cd446c3a20 /Configure
parent7d6766cb537e5cebc99e200bc537f744878a87a4 (diff)
downloadopenssl-new-e1f5a92df4b612de8eac7ca538ef44f4b1deec5a.tar.gz
Configure: handle undefined shared_target.
Some very basic config targets don't defined the 'shared_target' attribute at all. This wasn't handled well enough in Configure. This also cleans away an explicit reference to the ossltest engine in Configurations/unix-Makefile.tmpl, which isn't necessary since the build.info attributes were added. Fixes openssl/web#197 Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13031)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/Configure b/Configure
index 6219e2e37e..dfad3fe7a5 100755
--- a/Configure
+++ b/Configure
@@ -579,7 +579,7 @@ my @disable_cascades = (
# or modules.
"pic" => [ "shared", "module" ],
- "module" => [ "fips" ],
+ "module" => [ "fips", "dso" ],
"engine" => [ grep /eng$/, @disablables ],
"hw" => [ "padlockeng" ],
@@ -1444,7 +1444,7 @@ unless($disabled{threads}) {
}
my $no_shared_warn=0;
-if ($target{shared_target} eq "")
+if (($target{shared_target} // '') eq "")
{
$no_shared_warn = 1
if (!$disabled{shared} || !$disabled{"dynamic-engine"});