wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4383)
This commit is contained in:
Andy Polyakov 2017-09-18 16:30:28 +02:00
parent 51ac82702d
commit 3a1548643f
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Configurations/10-main.conf
View file

@ -763,7 +763,7 @@ sub vms_info {
inherit_from => [ "linux-x86" ],
cc => "clang",
cxx => "clang++",
cflags => add("-Wextra -Qunused-arguments"),
cflags => add("-Wextra"),
},
"linux-x86_64" => {
inherit_from => [ "linux-generic64", asm("x86_64_asm") ],
@ -777,7 +777,7 @@ sub vms_info {
inherit_from => [ "linux-x86_64" ],
cc => "clang",
cxx => "clang++",
cflags => add("-Wextra -Qunused-arguments"),
cflags => add("-Wextra"),
},
"linux-x32" => {
inherit_from => [ "linux-generic32", asm("x86_64_asm") ],

5
Configure
View file

@ -141,7 +141,6 @@ my $gcc_devteam_warn = "-DDEBUG_UNUSED"
# -Wunused-macros -- no, too tricky for BN and _XOPEN_SOURCE etc
# -Wextended-offsetof -- no, needed in CMS ASN1 code
my $clang_devteam_warn = ""
. " -Qunused-arguments"
. " -Wswitch-default"
. " -Wno-parentheses-equality"
. " -Wno-language-extension-token"
@ -1321,6 +1320,10 @@ if (defined($config{api})) {
push @{$config{defines}}, $apiflag;
}
if (defined($predefined{__clang__}) && !$disabled{asm}) {
$config{cflags} .= " -Qunused-arguments";
}
if ($strict_warnings)
{
my $wopt;