From d7d5effdfb5b3de9ad25dfafa8a6bb106f88fb56 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Wed, 24 Jul 2019 14:45:36 +0100 Subject: [PATCH] Base relocatable RPATH on ${libdir} Signed-off-by: Simon McVittie <smcv@collabora.com> --- meson.build | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 3a71b803b..a944c143a 100644 --- a/meson.build +++ b/meson.build @@ -222,14 +222,6 @@ if libcapsule_dsc != '' endforeach endif -if host_machine.cpu_family() == 'x86_64' - multiarch = 'x86_64-linux-gnu' -elif host_machine.cpu_family() == 'x86' - multiarch = 'i386-linux-gnu' -else - error('CPU family not supported') -endif - cc = meson.get_compiler('c') conf_data = configuration_data() @@ -262,10 +254,10 @@ executable( dependency('xau', required : true), subproject('libglnx').get_variable('libglnx_dep'), ], - build_rpath : '${ORIGIN}/../lib/' + multiarch, + build_rpath : '${ORIGIN}/../' + get_option('libdir'), install : true, install_dir : get_option('bindir'), - install_rpath : '${ORIGIN}/../lib/' + multiarch, + install_rpath : '${ORIGIN}/../' + get_option('libdir'), ) meson.add_install_script( -- GitLab