Skip to content

Commit

Permalink
Force some native libraries to be static libraries
Browse files Browse the repository at this point in the history
This should fix #1441
  • Loading branch information
facekapow committed Oct 20, 2023
1 parent fbcd182 commit 74d3356
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/external/darlingserver
2 changes: 1 addition & 1 deletion src/libsimple/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/startup/mldr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 74d3356

Please sign in to comment.