nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

Merge pull request #13963 from xokdvium/fix-no-gc

Browse source 
libexpr: Fix build without Boehm
This commit is contained in:
Jörg Thalheim 2025-09-12 08:23:19 +02:00 • committed by GitHub
commit f6802a8ccf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/eval-gc.cc
View file

@ -24,6 +24,10 @@
#endif #endif
namespace nix {
#if NIX_USE_BOEHMGC
/* /*
* Ensure that Boehm satisfies our alignment requirements. This is the default configuration [^] * Ensure that Boehm satisfies our alignment requirements. This is the default configuration [^]
* and this assertion should never break for any platform. Let's assert it just in case. * and this assertion should never break for any platform. Let's assert it just in case.
@ -35,9 +39,6 @@
*/ */
static_assert(sizeof(void *) * 2 == GC_GRANULE_BYTES, "Boehm GC must use GC_GRANULE_WORDS = 2"); static_assert(sizeof(void *) * 2 == GC_GRANULE_BYTES, "Boehm GC must use GC_GRANULE_WORDS = 2");
namespace nix {
#if NIX_USE_BOEHMGC
/* Called when the Boehm GC runs out of memory. */ /* Called when the Boehm GC runs out of memory. */
static void * oomHandler(size_t requested) static void * oomHandler(size_t requested)
{ {