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

build: Don't set RPATH on -wrap without -Drelocatable


If we have built pressure-vessel without bundling the necessary
libraries, then we want it to use libraries from the host system, not
the (probably older) bundled libraries from a different
pressure-vessel build.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 009ce02d
No related branches found
No related tags found
No related merge requests found
......@@ -233,6 +233,15 @@ configure_file(
configuration : conf_data,
)
if get_option('relocatable')
rpath_kwargs = {
'build_rpath' : '${ORIGIN}/../' + get_option('libdir'),
'install_rpath' : '${ORIGIN}/../' + get_option('libdir'),
}
else
rpath_kwargs = {}
endif
executable(
'pressure-vessel-wrap',
sources : [
......@@ -254,10 +263,9 @@ executable(
dependency('xau', required : true),
subproject('libglnx').get_variable('libglnx_dep'),
],
build_rpath : '${ORIGIN}/../' + get_option('libdir'),
install : true,
install_dir : get_option('bindir'),
install_rpath : '${ORIGIN}/../' + get_option('libdir'),
kwargs : rpath_kwargs,
)
if get_option('relocatable')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment