X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=a335f738507a31bb78dbf95a224d3e5f1768b41d;hb=e1dc8c1d1d8a6082e0e28c444fe6ef73548f6035;hp=6325d5a2d561a130e8242ced99a2b19d9be6303d;hpb=30c0b7ebd9954339486f1286b82df4776e1bc9b4;p=nageru

diff --git a/meson.build b/meson.build
index 6325d5a..a335f73 100644
--- a/meson.build
+++ b/meson.build
@@ -105,9 +105,6 @@ if have_cef
 		nageru_install_rpath = '$ORIGIN/'
 	endif
 
-	cefdep = cxx.find_library('cef', dirs: cef_lib_dir)
-	nageru_deps += cefdep
-
 	# CEF wrapper library; not built as part of the CEF binary distribution,
 	# but should be if CEF is installed as a system library.
 	if system_cef
@@ -150,6 +147,13 @@ if have_cef
 	endforeach
 	run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
 	install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
+
+	# NOTE: We link against libcef.so in the local directory, _not_ in the CEF directory,
+	# since upstream CEF searches for icudtl.dat in whatever path dladdr() says libcef.so
+	# comes from, and the upstream CEF tarballs have libcef.so and icudtl.dat in different
+	# directories. Thus, get both from the local symlinks we just created.
+	cefdep = cxx.find_library('cef', dirs: meson.current_build_dir())
+	nageru_deps += cefdep
 endif
 
 # bmusb.