diff options
author | Todd Short <tshort@akamai.com> | 2020-09-02 16:57:46 -0400 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-01-14 10:35:16 +0100 |
commit | cfd7225fbb9507b2e443a494459bdaab5236d29d (patch) | |
tree | 65327a357131581a3499d86222f502ac23440f75 | |
parent | dfe07182aac02b962a5a72d86cab69e59e90aeca (diff) |
Fix -static builds
Pull in check from #10878
Move disabling of pic, threads and statics up higher before they
are checked.
Fixes #12772
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12773)
-rwxr-xr-x | Configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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"; @@ -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 : ( $_ ) } |