From 74d33562103d063febdabbc42e0dba3161425b34 Mon Sep 17 00:00:00 2001 From: Ariel Abreu Date: Fri, 20 Oct 2023 13:43:19 -0400 Subject: [PATCH] Force some native libraries to be static libraries This should fix #1441 --- src/external/darlingserver | 2 +- src/libsimple/CMakeLists.txt | 2 +- src/startup/mldr/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/external/darlingserver b/src/external/darlingserver index f738dde46..99d3c764b 160000 --- a/src/external/darlingserver +++ b/src/external/darlingserver @@ -1 +1 @@ -Subproject commit f738dde46308ef174506750ece797a066d77dc70 +Subproject commit 99d3c764bf0564a5dc5dd47e96281ecfa72d5d1a diff --git a/src/libsimple/CMakeLists.txt b/src/libsimple/CMakeLists.txt index dabe277f7..52bc2337f 100644 --- a/src/libsimple/CMakeLists.txt +++ b/src/libsimple/CMakeLists.txt @@ -7,7 +7,7 @@ set(libsimple_sources if (NOT DEFINED libsimple_linux_added) set(libsimple_linux_added TRUE PARENT_SCOPE) - add_library(libsimple_darlingserver "${libsimple_sources}") + add_library(libsimple_darlingserver STATIC "${libsimple_sources}") target_include_directories(libsimple_darlingserver PUBLIC include diff --git a/src/startup/mldr/CMakeLists.txt b/src/startup/mldr/CMakeLists.txt index 70c782297..5e4271a17 100644 --- a/src/startup/mldr/CMakeLists.txt +++ b/src/startup/mldr/CMakeLists.txt @@ -8,7 +8,7 @@ set_source_files_properties(${CMAKE_BINARY_DIR}/src/external/darlingserver/src/r GENERATED TRUE ) -add_library(mldr_dserver_rpc ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c) +add_library(mldr_dserver_rpc STATIC ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c) add_dependencies(mldr_dserver_rpc generate_dserver_rpc_wrappers) @@ -36,7 +36,7 @@ configure_file(darling.conf.in darling.conf @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/darling.conf" DESTINATION lib/binfmt.d) if (BUILD_TARGET_32BIT) - add_library(mldr32_dserver_rpc ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c) + add_library(mldr32_dserver_rpc STATIC ${CMAKE_BINARY_DIR}/src/external/darlingserver/src/rpc.c) add_dependencies(mldr32_dserver_rpc generate_dserver_rpc_wrappers) target_compile_options(mldr32_dserver_rpc PRIVATE -include ${CMAKE_CURRENT_SOURCE_DIR}/resources/dserver-rpc-defs.h) target_compile_options(mldr32_dserver_rpc PRIVATE -m32)