From a7d4d644ac3e8fc35a5460054943b011815f647e Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Tue, 18 Mar 2025 11:17:10 +0200 Subject: [PATCH] [#3731] Add rpath for hook libraries --- meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 363754d824..d5a79bf79a 100644 --- a/meson.build +++ b/meson.build @@ -471,15 +471,16 @@ compile_args = [] link_args = [] # $ORIGIN documented at https://www.man7.org/linux/man-pages/man8/ld.so.8.html -rpath = '$ORIGIN/../lib' +rpath1 = '$ORIGIN/../lib' # rpath for executables +rpath2 = '$ORIGIN/../..' # rpath for hook libraries if SYSTEM == 'darwin' compile_args += ['-D__APPLE_USE_RFC_3542'] add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp') - link_arg = f'-Wl,-rpath,@rpath@' + link_arg = f'-Wl,-rpath,@rpath1@,-rpath,@rpath2@' link_args += [link_arg] add_project_link_arguments(link_arg, language: 'cpp') else - link_arg = f'-Wl,-rpath=@rpath@' + link_arg = f'-Wl,-rpath=@rpath1@,-rpath=@rpath2@' link_args += [link_arg] add_project_link_arguments(link_arg, language: 'cpp') endif