From a7e1b2316586da51dab4fd265864a9763e153a45 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sun, 31 Aug 2025 10:48:28 +0200 Subject: [PATCH] libexpr: remove liblixexpr_mstatic It was supposed to be removed in 480fdf146d9c29d3de19b856409dc648df3ddcf6, as it is not needed any more with the prelinked library. Due to a mistake in rebase conflict resolution it reappeared by accident. Actually remove it now. Change-Id: I6a6a6964d175fdb0ba0ad9ac55d4d22d7b27ad3f --- lix/libexpr/meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lix/libexpr/meson.build b/lix/libexpr/meson.build index 8a5cde12b..199b12de4 100644 --- a/lix/libexpr/meson.build +++ b/lix/libexpr/meson.build @@ -342,9 +342,7 @@ liblixexpr = declare_dependency( link_with : libexpr, ) -# FIXME: remove when https://git.lix.systems/lix-project/lix/issues/359 is fixed. -liblixexpr_mstatic = is_static ? liblixexpr.as_link_whole() : liblixexpr -meson.override_dependency('lix-expr', liblixexpr_mstatic) +meson.override_dependency('lix-expr', liblixexpr) # FIXME: not using the pkg-config module because it creates way too many deps # while meson migration is in progress, and we want to not include boost here