提交 3a154864 编写于 作者: A Andy Polyakov

Configure: unify clang's -Qunused-arguments option treatment.

Detect clang even if it's disguised, e.g. cross-compiler or invoked by
explicit path name, and add the option based on that.
Reviewed-by: NBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4383)
上级 51ac8270
...@@ -763,7 +763,7 @@ sub vms_info { ...@@ -763,7 +763,7 @@ sub vms_info {
inherit_from => [ "linux-x86" ], inherit_from => [ "linux-x86" ],
cc => "clang", cc => "clang",
cxx => "clang++", cxx => "clang++",
cflags => add("-Wextra -Qunused-arguments"), cflags => add("-Wextra"),
}, },
"linux-x86_64" => { "linux-x86_64" => {
inherit_from => [ "linux-generic64", asm("x86_64_asm") ], inherit_from => [ "linux-generic64", asm("x86_64_asm") ],
...@@ -777,7 +777,7 @@ sub vms_info { ...@@ -777,7 +777,7 @@ sub vms_info {
inherit_from => [ "linux-x86_64" ], inherit_from => [ "linux-x86_64" ],
cc => "clang", cc => "clang",
cxx => "clang++", cxx => "clang++",
cflags => add("-Wextra -Qunused-arguments"), cflags => add("-Wextra"),
}, },
"linux-x32" => { "linux-x32" => {
inherit_from => [ "linux-generic32", asm("x86_64_asm") ], inherit_from => [ "linux-generic32", asm("x86_64_asm") ],
......
...@@ -141,7 +141,6 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED" ...@@ -141,7 +141,6 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
# -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc # -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc
# -Wextended-offsetof -- no, needed in CMS ASN1 code # -Wextended-offsetof -- no, needed in CMS ASN1 code
my $clang_devteam_warn = "" my $clang_devteam_warn = ""
. " -Qunused-arguments"
. " -Wswitch-default" . " -Wswitch-default"
. " -Wno-parentheses-equality" . " -Wno-parentheses-equality"
. " -Wno-language-extension-token" . " -Wno-language-extension-token"
...@@ -1321,6 +1320,10 @@ if (defined($config{api})) { ...@@ -1321,6 +1320,10 @@ if (defined($config{api})) {
push @{$config{defines}}, $apiflag; push @{$config{defines}}, $apiflag;
} }
if (defined($predefined{__clang__}) && !$disabled{asm}) {
$config{cflags} .= " -Qunused-arguments";
}
if ($strict_warnings) if ($strict_warnings)
{ {
my $wopt; my $wopt;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册