taynpg/transm
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 29 Wiki Activity

add：添加支持musl静态链接

Browse Source
This commit is contained in:
taynpg 2025-02-17 18:29:23 +08:00
parent 3b3ea32de1
commit 4e158b3065
6 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -1,5 +1,3 @@
#!/bin/bash
# 默认构建命令 # 默认构建命令
build_command="cmake -Bbuild -DCMAKE_BUILD_TYPE=Release" build_command="cmake -Bbuild -DCMAKE_BUILD_TYPE=Release"
build_command_release="cmake --build build --config Release" build_command_release="cmake --build build --config Release"

13
client/CMakeLists.txt
View File

@ -23,4 +23,15 @@ endif()
if(DEFINED MINGW32_XP_BOOST) if(DEFINED MINGW32_XP_BOOST)
target_link_directories(tsc PRIVATE ${MBOOST_LIB_DIR}) target_link_directories(tsc PRIVATE ${MBOOST_LIB_DIR})
target_link_libraries(tsc PRIVATE ${MBOOST_LIBS}) target_link_libraries(tsc PRIVATE ${MBOOST_LIBS})
endif() endif()
if(UNIX)
execute_process(
COMMAND uname -a
OUTPUT_VARIABLE UNAME_OUT
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(UNAME_OUT MATCHES "alpine" OR UNAME_OUT MATCHES "Alpine")
message(STATUS "tsc on musl static link")
target_link_libraries(tsc PRIVATE -static;-static-libstdc++)
endif()
endif()

6
config/MSystem.cmake
View File

@ -19,7 +19,9 @@ elseif(UNAME_OUTPUT MATCHES "riscv64")
else() else()
set(SYSTEM_ARCH "unknown") set(SYSTEM_ARCH "unknown")
endif() endif()
if(UNAME_OUTPUT MATCHES "alpine" OR UNAME_OUTPUT MATCHES "Alpine")
set(SYSTEM_ARCH "musl_${SYSTEM_ARCH}")
endif()
elseif (WIN32) elseif (WIN32)
# 先调用 ver 命令 # 先调用 ver 命令
execute_process(COMMAND cmd /c ver execute_process(COMMAND cmd /c ver
@ -41,4 +43,4 @@ elseif (WIN32)
else() else()
message(FATAL_ERROR "unknow system type.") message(FATAL_ERROR "unknow system type.")
endif() endif()
message(STATUS "SYSTEM_ARCH: ${SYSTEM_ARCH}") message(STATUS "SYSTEM_ARCH: ${SYSTEM_ARCH}")

2
filecomplete

@ -1 +1 @@
Subproject commit a7c6434a7c333a19727aeab8212d20604426b701 Subproject commit 86e71fbb462efce80e601db0807bca0887829836

2
ofen

@ -1 +1 @@
Subproject commit 36e05d261821048a4c2fec1042434dd2dfc9b6de Subproject commit c4572bbfef4b39d40f8f530aecdf0998d1821232

13
server/CMakeLists.txt
View File

@ -22,4 +22,15 @@ if (UNIX)
endif() endif()
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_SYSTEM_NAME MATCHES "Windows") if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_SYSTEM_NAME MATCHES "Windows")
target_link_libraries(tss PRIVATE ws2_32 wsock32) target_link_libraries(tss PRIVATE ws2_32 wsock32)
endif() endif()
if(UNIX)
execute_process(
COMMAND uname -a
OUTPUT_VARIABLE UNAME_OUT
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(UNAME_OUT MATCHES "alpine" OR UNAME_OUT MATCHES "Alpine")
message(STATUS "on musl static link")
target_link_libraries(tss PRIVATE -static;-static-libstdc++)
endif()
endif()