diff options
author | Dylan Baker <[email protected]> | 2018-03-22 11:35:08 -0700 |
---|---|---|
committer | Dylan Baker <[email protected]> | 2018-03-22 11:35:08 -0700 |
commit | 8e5988eb35bad496e4e06e27f8cba68ba87ca31b (patch) | |
tree | 9c19c0d7353bb9d4e7c7b144e11100ac4c1a76db /meson.build | |
parent | 1603ce1921a511f128025a49d055283440376231 (diff) |
Revert "meson: merge C and C++ compiler arguments check"
This reverts commit cb2ddcefa5196fdfeff76f405175c7a6c110eae4.
This causes clang to error out building C++ code. The plan is to fix the
build to work with clang, but in the mean time we'll just revert this
Signed-off-by: Dylan Baker <[email protected]>
Acked-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 6edb089db90..871b0d8d22f 100644 --- a/meson.build +++ b/meson.build @@ -764,9 +764,7 @@ if ['linux', 'cygwin'].contains(host_machine.system()) pre_args += '-D_GNU_SOURCE' endif -# Check for generic C/C++ arguments -cpp = meson.get_compiler('cpp') -cpp_args = [] +# Check for generic C arguments c_args = [] foreach a : ['-Wall', '-Werror=implicit-function-declaration', '-Werror=missing-prototypes', '-fno-math-errno', @@ -774,15 +772,22 @@ foreach a : ['-Wall', '-Werror=implicit-function-declaration', if cc.has_argument(a) c_args += a endif - if cpp.has_argument(a) - cpp_args += a - endif endforeach c_vis_args = [] if cc.has_argument('-fvisibility=hidden') c_vis_args += '-fvisibility=hidden' endif +# Check for generic C++ arguments +cpp = meson.get_compiler('cpp') +cpp_args = [] +foreach a : ['-Wall', '-fno-math-errno', '-fno-trapping-math', + '-Qunused-arguments'] + if cpp.has_argument(a) + cpp_args += a + endif +endforeach + # For some reason, the test for -Wno-foo always succeeds with gcc, even if the # option is not supported. Hence, check for -Wfoo instead. if cpp.has_argument('-Wnon-virtual-dtor') |