提交 26f0340d 编写于 作者: R Richard Levitte

Configure: when checking user input, check both %user and %useradd

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5207)
上级 63468812
...@@ -1154,7 +1154,8 @@ if ($target =~ /^mingw/ && `$config{cc} --target-help 2>&1` =~ m/-mno-cygwin/m) ...@@ -1154,7 +1154,8 @@ if ($target =~ /^mingw/ && `$config{cc} --target-help 2>&1` =~ m/-mno-cygwin/m)
} }
if ($target =~ /linux.*-mips/ && !$disabled{asm} 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 # minimally required architecture flags for assembly modules
my $value; my $value;
$value = '-mips2' if ($target =~ /mips32/); $value = '-mips2' if ($target =~ /mips32/);
...@@ -1202,7 +1203,8 @@ unless ($disabled{threads}) { ...@@ -1202,7 +1203,8 @@ unless ($disabled{threads}) {
# system-dependent compiler options that are necessary. We # system-dependent compiler options that are necessary. We
# can't truly check that the given options are correct, but # can't truly check that the given options are correct, but
# we expect the user to know what [s]He is doing. # 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" die "You asked for multi-threading support, but didn't\n"
,"provide any system-specific compiler options\n"; ,"provide any system-specific compiler options\n";
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册