folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed micromamba static build after cctools and ld64 upgrade on conda… (#3436) 

Fixed micromamba static build after cctools and ld64 upgrade on conda-forge
This commit is contained in:
Johan Mabille 2024-09-09 16:53:28 +02:00 committed by GitHub
parent c4a6e78a78
commit f8bb11c853
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmamba/CMakeLists.txt
View File

@ -526,7 +526,7 @@ macro(libmamba_create_target target_name linkage output_name)
if(APPLE) if(APPLE)
set(MAMBA_FORCE_DYNAMIC_LIBS resolv c++abi) set(MAMBA_FORCE_DYNAMIC_LIBS resolv c++abi)
target_link_options(${target_name} PRIVATE -static-libstdc++) target_link_options(${target_name} PRIVATE -nostdlib++)
elseif(UNIX) elseif(UNIX)
set(MAMBA_FORCE_DYNAMIC_LIBS rt dl resolv) set(MAMBA_FORCE_DYNAMIC_LIBS rt dl resolv)
target_link_options(${target_name} PUBLIC -static-libstdc++ -static-libgcc) target_link_options(${target_name} PUBLIC -static-libstdc++ -static-libgcc)

3
micromamba/CMakeLists.txt
View File

@ -79,6 +79,9 @@ macro(mambaexe_create_target target_name linkage output_name)
find_package(libmamba REQUIRED) find_package(libmamba REQUIRED)
endif() endif()
target_link_libraries(${target_name} PRIVATE mamba::libmamba-static) target_link_libraries(${target_name} PRIVATE mamba::libmamba-static)
if(APPLE)
target_link_options(${target_name} PRIVATE -nostdlib++)
endif()
# Dynamic build # Dynamic build
# ============= # =============
else() else()