PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: 25bfdb3a by Weijia Wang at 2023-03-22T20:09:38+02:00 echo-cancel: Fix macOS build Signed-off-by: Weijia Wang <[email protected]> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/786> - - - - - 1 changed file: - src/modules/echo-cancel/meson.build Changes: ===================================== src/modules/echo-cancel/meson.build ===================================== @@ -3,7 +3,8 @@ # even conditional ones). # This library requires a symbol from module-echo-cancel, hence we need -# '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails +# '-Wl,--unresolved-symbols=ignore-in-object-files', or +# '-Wl,-undefined,dynamic_lookup' on macOS, otherwise it fails # at link time. add_languages('cpp') @@ -12,12 +13,18 @@ libwebrtc_util_sources = [ 'webrtc.cc' ] +if host_machine.system() == 'darwin' + ignore_unresolved_symbols_link_args = ['-Wl,-undefined,dynamic_lookup'] +else + ignore_unresolved_symbols_link_args = ['-Wl,--unresolved-symbols=ignore-in-object-files'] +endif + libwebrtc_util = shared_library('webrtc-util', libwebrtc_util_sources, cpp_args : [pa_c_args, server_c_args], include_directories : [configinc, topinc], dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep, webrtc_dep, libintl_dep], - link_args : [nodelete_link_args, '-Wl,--unresolved-symbols=ignore-in-object-files'], + link_args : [nodelete_link_args, ignore_unresolved_symbols_link_args], install : true, install_rpath : privlibdir, install_dir : modlibexecdir, View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/25bfdb3ab8ae25d477927ff24c3ca4d2d4e81246 -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/25bfdb3ab8ae25d477927ff24c3ca4d2d4e81246 You're receiving this email because of your account on gitlab.freedesktop.org.
