From c6f87ade8445902b841f4a7916b3c5daca5f1926 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Sep 2020 11:42:17 +1000 Subject: [PATCH] meson.build: drop the separate cpp flags All we care about for C++ is that we build. Signed-off-by: Peter Hutterer --- meson.build | 10 +++++++--- test/build-cxx.cc | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 5c8bf1b3..963c25b8 100644 --- a/meson.build +++ b/meson.build @@ -42,10 +42,14 @@ libinput_so_version = '@0@.@1@.@2@'.format((libinput_lt_c - libinput_lt_a), # Compiler setup cc = meson.get_compiler('c') -cppflags = ['-Wno-unused-parameter', '-fvisibility=hidden'] -cflags = cppflags + ['-Wmissing-prototypes', '-Wstrict-prototypes'] +cflags = [ + '-Wno-unused-parameter', + '-Wmissing-prototypes', + '-Wstrict-prototypes' + + '-fvisibility=hidden', +] add_project_arguments(cflags, language : 'c') -add_project_arguments(cppflags, language : 'cpp') # config.h config_h = configuration_data() diff --git a/test/build-cxx.cc b/test/build-cxx.cc index c3ad4994..327416fb 100644 --- a/test/build-cxx.cc +++ b/test/build-cxx.cc @@ -5,7 +5,7 @@ using namespace std; int -main(int argc, char **argv) +main(void) { return 0; }