diff options
author | Richard Levitte <levitte@openssl.org> | 2018-01-30 17:21:12 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-01-30 19:08:49 +0100 |
commit | 26f0340d49138d489ffc9662dff827488a12142c (patch) | |
tree | 243de860de1f62b57180f75dcfb80f4820f7a142 /Configure | |
parent | 63468812bdbee64bb3ca757c4692cb3cf2ace01e (diff) |
Configure: when checking user input, check both %user and %useradd
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5207)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1154,7 +1154,8 @@ if ($target =~ /^mingw/ && `$config{cc} --target-help 2>&1` =~ m/-mno-cygwin/m) } if ($target =~ /linux.*-mips/ && !$disabled{asm} - && !grep { $_ !~ /-m(ips|arch=)/ } @{$user{CFLAGS}}) { + && !grep { $_ !~ /-m(ips|arch=)/ } (@{$user{CFLAGS}}, + @{$useradd{CFLAGS}}) { # minimally required architecture flags for assembly modules my $value; $value = '-mips2' if ($target =~ /mips32/); @@ -1202,7 +1203,8 @@ unless ($disabled{threads}) { # system-dependent compiler options that are necessary. We # can't truly check that the given options are correct, but # we expect the user to know what [s]He is doing. - if (!@{$user{CFLAGS}} && !@{$user{CPPDEFINES}}) { + if (!@{$user{CFLAGS}} && !@{$useradd{CFLAGS}} + && !@{$user{CPPDEFINES}} && !@{$useradd{CPPDEFINES}}) { die "You asked for multi-threading support, but didn't\n" ,"provide any system-specific compiler options\n"; } |