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

apple-related workarounds

This commit is contained in:
Klaim (Joël Lamotte) 2025-07-17 15:38:01 +02:00 committed by Joël Lamotte (Klaim)
parent 5741432ded
commit f788cc07c5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmamba/src/core/logging.cpp
View File

@ -23,7 +23,7 @@ namespace mamba::logging
// and avoid static-init-fiasco.
// But depending on the implementation it is not always possible, so we pay
// the locking cost in these platforms.
#if defined(__apple_build_version__) // apple-clang
#if defined(__apple_build_version__) or (defined(_LIBCPP_VERSION) and _LIBCPP_VERSION < 19) // apple-clang or libc++
using params_mutex = std::mutex;
#else
using params_mutex = std::shared_mutex;

9
libmamba/src/core/shell_init.cpp
View File

@ -15,10 +15,13 @@
#include <fmt/ostream.h>
#include <fmt/xchar.h>
#include <reproc++/run.hpp>
#ifdef _WIN32
#include <WinReg.hpp>
#include "mamba/util/os_win.hpp"
#ifdef _WIN32
# include <WinReg.hpp>
# include "mamba/util/os_win.hpp"
#else
# include <unistd.h>
#endif
#include "mamba/core/activation.hpp"