From 26f0340d49138d489ffc9662dff827488a12142c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 30 Jan 2018 17:21:12 +0100 Subject: [PATCH] Configure: when checking user input, check both %user and %useradd Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5207) --- Configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Configure b/Configure index cde97f9b2a..b7ccbc5a04 100755 --- a/Configure +++ b/Configure @@ -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"; } -- 2.25.1