Remove a now-obsolete Meson workaround, which also fixes a warning.

diff --git a/meson.build b/meson.build
index 2be9488d227fcdcf8ba551c515963ad549fd767d..b190b4ab757126b82294bc0f340492c1a9b73a37 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -122,13 +122,10 @@ if have_cef
 
                cef_dll_target = custom_target('libcef_dll_wrapper',
                        input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
-                       output: ['libcef_dll_wrapper.a', 'cef-stamp'],
+                       output: ['libcef_dll_wrapper.a'],
                        command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
 
-               # Putting the .a in sources seemingly hits a bug where the .a files get sorted
-               # in the wrong order. This is a workaround; see
-               # https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
-               cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
+               cefdlldep = declare_dependency(link_with: cef_dll_target)
                nageru_deps += cefdlldep
        endif
 

diff --git a/nageru/scripts/compile_cef_dll_wrapper.sh b/nageru/scripts/compile_cef_dll_wrapper.sh
index ee8dbb2408f3760b9322b25bc7f7b106aa721ed0..c819f54c0f00d0f27af218ce9fcee304a646e0b9 100755 (executable)
--- a/nageru/scripts/compile_cef_dll_wrapper.sh
+++ b/nageru/scripts/compile_cef_dll_wrapper.sh
@@ -5,10 +5,8 @@ BUILD_DIR="$1"
 CEF_DIR="$2"
 CMAKE="$3"
 OUTPUT="$4"
-STAMP="$5"
 
 ! [ -d "$BUILD_DIR" ] || rm -r "$BUILD_DIR"
 mkdir "$BUILD_DIR"
 ( cd "$BUILD_DIR" && $CMAKE -G Ninja "$CEF_DIR" && ninja libcef_dll_wrapper )
 cp "$BUILD_DIR"/libcef_dll_wrapper/libcef_dll_wrapper.a "$OUTPUT"
-touch "$STAMP"