Fix libunwind native dep so Flatpak builds once again.

This commit is contained in:
Michael James Gratton 2018-07-04 13:15:20 +10:00
parent 0e6d499808
commit a3662c8155

View file

@ -74,12 +74,14 @@ webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '
# Libunwind system dependencies above ensures appropriate versions,
# but this declared depencency is what we actually build against so we
# can include the custom VAPI correctly.
# can include the custom VAPI correctly. We need to add unwind_lib to
# the search path for these so Flatpak builds can find the C lib.
unwind_lib = libunwind_dep.get_pkgconfig_variable('libdir')
libunwind = declare_dependency(
dependencies: [
valac.find_library('libunwind', dirs: vapi_dir),
cc.find_library('unwind'),
cc.find_library('unwind-generic')
valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]),
cc.find_library('libunwind', dirs: unwind_lib),
cc.find_library('libunwind-generic', dirs: unwind_lib)
],
)