Skip to content

Commit

Permalink
Fixes openssl#12772: Fix -static builds
Browse files Browse the repository at this point in the history
Pull in check from openssl#10878
Move disabling of pic, threads and statics up higher before they
are checked.
  • Loading branch information
tmshort committed Sep 3, 2020
1 parent 56456c3 commit 141243e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Configure
Expand Up @@ -1201,6 +1201,10 @@ foreach (keys %useradd) {
# At this point, we can forget everything about %user and %useradd,
# because it's now all been merged into the corresponding $config entry

if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
disable('static', 'pic', 'threads');
}

# Allow overriding the build file name
$config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile";

Expand Down Expand Up @@ -1521,10 +1525,6 @@ if ($strict_warnings)
}
}

if (grep { $_ eq '-static' } @{$config{LDFLAGS}}) {
disable('static', 'pic', 'threads');
}

$config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
? @strict_warnings_collection
: ( $_ ) }
Expand Down

0 comments on commit 141243e

Please sign in to comment.