diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 2a5696a..8521520 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -10,7 +10,6 @@ env: CCACHE_DIR: /ccache CCACHE_MAXSIZE: 10G CCACHE_BASEDIR: /root/.conan2 - CCACHE_NOHASHDIR: "true" CCACHE_COMPILERCHECK: "%compiler% -dumpversion" jobs: diff --git a/ConanProfiles/clang b/ConanProfiles/clang index 8f909df..0dadd57 100644 --- a/ConanProfiles/clang +++ b/ConanProfiles/clang @@ -17,12 +17,10 @@ tools.meson.mesontoolchain:extra_machine_files+={{profile_dir}}/Toolchains/ipo.i tools.system.package_manager:mode=install tools.system.package_manager:sudo=True -tools.build:exelinkflags=["-fuse-ld=mold"] -tools.build:sharedlinkflags=["-fuse-ld=mold"] - tools.build:compiler_executables={"c": "clang", "cpp": "clang++"} -tools.cmake.cmaketoolchain:generator=Ninja - [tool_requires] -!cmake/*: cmake/[>=4.2] \ No newline at end of file +!cmake/*: cmake/[>=4.2] + +[buildenv] +CCACHE_NOHASHDIR=1 \ No newline at end of file diff --git a/ConanProfiles/msvc b/ConanProfiles/msvc index 5c0d4aa..d2cc52f 100644 --- a/ConanProfiles/msvc +++ b/ConanProfiles/msvc @@ -17,4 +17,7 @@ tools.build:cflags=["/Zc:preprocessor", "/Zc:__STDC__", "/D_CRT_DECLARE_NONSTDC_ tools.build:cxxflags=["/Zc:preprocessor", "/permissive-", "/Zc:__cplusplus", "/Zc:enumTypes", "/Zc:templateScope"] [tool_requires] -!cmake/*: cmake/[>=4.2] \ No newline at end of file +!cmake/*: cmake/[>=4.2] + +[buildenv] +CCACHE_NOHASHDIR=1 \ No newline at end of file diff --git a/mimalloc/all/conandata.yml b/mimalloc/all/conandata.yml index 714cd48..7784d6a 100644 --- a/mimalloc/all/conandata.yml +++ b/mimalloc/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "3.3.1": + url: "https://github.com/microsoft/mimalloc/archive/v3.3.1.tar.gz" + sha256: "42c16914168ac6741eeb407e83b93a12b2b7ee25a7e14e6b4807fab8b577a540" "3.2.8": url: "https://github.com/microsoft/mimalloc/archive/v3.2.8.tar.gz" sha256: "68163666575518c213a6593850099adce3863b340ca2751103dbd1f253664e05" diff --git a/mimalloc/config.yml b/mimalloc/config.yml index b764a88..d5845c2 100644 --- a/mimalloc/config.yml +++ b/mimalloc/config.yml @@ -1,4 +1,6 @@ versions: + "3.3.1": + folder: all "3.2.8": folder: all "3.1.5": diff --git a/mold/all/conanfile.py b/mold/all/conanfile.py index 0f97cc5..b98bc2a 100644 --- a/mold/all/conanfile.py +++ b/mold/all/conanfile.py @@ -43,7 +43,7 @@ class MoldConan(ConanFile): self.requires("zlib/[>=1.2.11 <2]") self.requires("xxhash/0.8.2") if self.options.with_mimalloc: - self.requires("mimalloc/2.1.2") + self.requires("mimalloc/3.3.1") if Version(self.version) < "2.2.0": # Newer versions use vendored-in BLAKE3 self.requires("openssl/[>=1.1 <4]")