[glibmm/kjellahl/meson-build-2-62] Revert "meson: Don't use `objects:` in glibmm, giomm"



commit b8524eeb00a43d8cadcd7732ab2472d92f818de0
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 5 23:47:15 2020 +0800

    Revert "meson: Don't use `objects:` in glibmm, giomm"
    
    This reverts commit b03c6d558d912ab66cafac37d5c9fdd63e46d61b.
    
    Apparently that commit caused the g++ linker to optimize most of the
    items out from the final library.

 gio/giomm/meson.build   | 3 ++-
 glib/glibmm/meson.build | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/gio/giomm/meson.build b/gio/giomm/meson.build
index 0b4580da..a64cb8c7 100644
--- a/gio/giomm/meson.build
+++ b/gio/giomm/meson.build
@@ -379,11 +379,12 @@ if is_host_windows
 endif
 
 giomm_library = library(giomm_pcname, extra_giomm_objects,
+  objects: gio_int_lib.extract_all_objects(),
   version: glibmm_libversion,
   dependencies: giomm_build_dep,
   link_depends: giomm_def,
   link_args: giomm_extra_link_args,
-  link_with: [gio_int_lib, glibmm_library],
+  link_with: glibmm_library,
   install: true,
 )
 
diff --git a/glib/glibmm/meson.build b/glib/glibmm/meson.build
index da806bd7..c69dd3c8 100644
--- a/glib/glibmm/meson.build
+++ b/glib/glibmm/meson.build
@@ -337,7 +337,7 @@ if is_host_windows
 endif
 
 glibmm_library = library(glibmm_pcname, extra_glibmm_objects,
-  link_with: glib_int_lib,
+  objects: glib_int_lib.extract_all_objects(),
   version: glibmm_libversion,
   dependencies: glibmm_build_dep,
   link_depends: glibmm_def,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]