diff options
author | Tom Cosgrove <tom.cosgrove@arm.com> | 2021-05-17 09:59:57 +0100 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-05-26 17:34:01 +1000 |
commit | 0221b080cefa7358c0a0737d089caeec2979f930 (patch) | |
tree | 9ca625feb55d8abf48e447d2ca79f09832152d4a /Configure | |
parent | b93f6c2db94f736b497ff31a793c1e6766eaf209 (diff) | |
download | openssl-0221b080cefa7358c0a0737d089caeec2979f930.tar.gz |
Fix -static builds on master
Pull in Todd Short's fix cfd7225fbb from 1.1.1, which moves the disabling
of pic, threads and statics to before they are checked.
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15214)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1380,6 +1380,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 { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { + disable('static', 'pic', 'threads'); +} + # Allow overriding the build file name $config{build_file} = env('BUILDFILE') || $target{build_file} || "Makefile"; @@ -1668,10 +1672,6 @@ if ($strict_warnings) } } -if (grep { $_ =~ /(?:^|\s)-static(?:\s|$)/ } @{$config{LDFLAGS}}) { - disable('static', 'pic', 'threads'); -} - $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings' ? @strict_warnings_collection : ( $_ ) } |