mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 08:00:42 -05:00
meson: Let the linker create RPATH instead of RUNPATH tag
Running meson test from the build directory in a jhbuild environment picks up libraries which have been installed previously because LD_LIBRARY_PATH takes precendence over RUNPATH. Make the linker generate the RPATH tag again. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2307>
This commit is contained in:
parent
1914f533b8
commit
a76542e191
14
meson.build
14
meson.build
@ -59,6 +59,20 @@ i18n = import('i18n')
|
||||
fs = import('fs')
|
||||
cc = meson.get_compiler('c')
|
||||
|
||||
add_project_link_arguments(
|
||||
cc.get_supported_link_arguments(
|
||||
# meson automatically adds -rpath to targets and strips them when they
|
||||
# are installed. ld adds a RUNPATH tag for -rpath arguments by default.
|
||||
# This makes ld add a RPATH tag instead (as it did some time ago).
|
||||
# The reason why we want RPATH and not RUNPATH is that LD_LIBRARY_PATH
|
||||
# takes precedence over RUNPATH but not over RPATH. Since we usually run
|
||||
# development builds in jhbuild which sets up LD_LIBRARY_PATH this can
|
||||
# result in wrong dependencies being picked up by the linker.
|
||||
'-Wl,--disable-new-dtags',
|
||||
),
|
||||
language : 'c',
|
||||
)
|
||||
|
||||
prefix = get_option('prefix')
|
||||
|
||||
bindir = join_paths(prefix, get_option('bindir'))
|
||||
|
Loading…
Reference in New Issue
Block a user