From: Richard Levitte <levitte@openssl.org>
Date: Tue, 30 Jan 2018 16:21:12 +0000 (+0100)
Subject: Configure: when checking user input, check both %user and %useradd
X-Git-Tag: OpenSSL_1_1_1-pre1~91
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=26f0340d49138d489ffc9662dff827488a12142c;p=oweals%2Fopenssl.git

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)
---

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";
             }