Backport #3436 (#3465)

* Backport #3436 * Fix tests --------- Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
mamba-org · Oct 10, 2024 · e10e643 · e10e643
1 parent d69172d
commit e10e643
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/libmamba/CMakeLists.txt b/libmamba/CMakeLists.txt
@@ -421,7 +421,7 @@ macro(libmamba_create_target target_name linkage output_name)
 
             if (APPLE)
                 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)
                 set(MAMBA_FORCE_DYNAMIC_LIBS rt dl resolv)
                 target_link_options(${target_name} PUBLIC -static-libstdc++ -static-libgcc)

diff --git a/micromamba/CMakeLists.txt b/micromamba/CMakeLists.txt
@@ -77,6 +77,9 @@ message(STATUS "Micromamba linkage: ${MICROMAMBA_LINKAGE}")
 
 if (${MICROMAMBA_LINKAGE} STREQUAL "STATIC")
     target_link_libraries(micromamba PRIVATE libmamba-static)
+    if(APPLE)
+        target_link_options(micromamba PRIVATE -nostdlib++)
+    endif()
 else ()
     target_link_libraries(micromamba PRIVATE libmamba)
 endif ()

diff --git a/micromamba/tests/test_repoquery.py b/micromamba/tests/test_repoquery.py
@@ -77,7 +77,7 @@ def test_depends_recursive(yaml_env: Path):
     )
 
     if platform.system() == "Linux":
-        assert "libzlib" in res
+        assert "_openmp_mutex" in res
     elif platform.system() == "Darwin":
         assert "libcxx" in res
     elif platform.system() == "Windows":
@@ -91,7 +91,7 @@ def test_depends_tree(yaml_env: Path):
     )
 
     if platform.system() == "Linux":
-        assert "libzlib" in res
+        assert "_openmp_mutex" in res
     elif platform.system() == "Darwin":
         assert "libcxx" in res
     elif platform.system() == "Windows":