summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2022-07-25 21:49:25 +0200
committerTanu Kaskinen <tanuk@iki.fi>2022-08-15 17:37:10 +0300
commitc789bc5fe37d45e0a16b1b062b262785d25d2dfc (patch)
treee5cdce3c4a560668c7bb6724ee9647888f4591a7
parent1b031ecee69142c4b0ff6ea9767c0cabb61af144 (diff)
downloadpulseaudio-c789bc5fe37d45e0a16b1b062b262785d25d2dfc.tar.gz
meson.build: fix build without C++
Fix the following build failure without C++: ../output-1/build/pulseaudio-16.1/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++']] The following exception(s) were encountered: Running "/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++'" Fixes: - http://autobuild.buildroot.org/results/6526a21bd4da3b8458188f27c1ec04c381e4b673 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/737>
-rw-r--r--meson.build3
-rw-r--r--src/modules/echo-cancel/meson.build2
2 files changed, 4 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 132f35c92..90f1ede61 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('pulseaudio', 'c', 'cpp',
+project('pulseaudio', 'c',
version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(),
meson_version : '>= 0.50.0',
default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
@@ -435,6 +435,7 @@ endif
# Code coverage
if get_option('gcov')
+ add_languages('cpp')
add_project_arguments('--coverage', language: ['c', 'cpp'])
add_project_link_arguments('--coverage', language: ['c', 'cpp'])
endif
diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build
index 641cd35e7..3b998364e 100644
--- a/src/modules/echo-cancel/meson.build
+++ b/src/modules/echo-cancel/meson.build
@@ -6,6 +6,8 @@
# '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails
# at link time.
+add_languages('cpp')
+
libwebrtc_util_sources = [
'webrtc.cc'
]