Skip to content
Snippets Groups Projects
Commit d7d5effd authored by Simon McVittie's avatar Simon McVittie
Browse files

Base relocatable RPATH on ${libdir}

parent b57dbf6f
No related branches found
No related tags found
No related merge requests found
...@@ -222,14 +222,6 @@ if libcapsule_dsc != '' ...@@ -222,14 +222,6 @@ if libcapsule_dsc != ''
endforeach endforeach
endif 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') cc = meson.get_compiler('c')
conf_data = configuration_data() conf_data = configuration_data()
...@@ -262,10 +254,10 @@ executable( ...@@ -262,10 +254,10 @@ executable(
dependency('xau', required : true), dependency('xau', required : true),
subproject('libglnx').get_variable('libglnx_dep'), subproject('libglnx').get_variable('libglnx_dep'),
], ],
build_rpath : '${ORIGIN}/../lib/' + multiarch, build_rpath : '${ORIGIN}/../' + get_option('libdir'),
install : true, install : true,
install_dir : get_option('bindir'), install_dir : get_option('bindir'),
install_rpath : '${ORIGIN}/../lib/' + multiarch, install_rpath : '${ORIGIN}/../' + get_option('libdir'),
) )
meson.add_install_script( meson.add_install_script(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment