diff options
| author | Andreas T Jonsson <mail@andreasjonsson.se> | 2024-05-02 09:27:46 +0200 |
|---|---|---|
| committer | Andreas T Jonsson <mail@andreasjonsson.se> | 2024-05-02 09:27:46 +0200 |
| commit | 7feff1c11335be9c0d804c3ca93050b7d154aad8 (patch) | |
| tree | 62c89fcafad6b6c9445cb37153e62a6b23223d39 /src/build_settings.cpp | |
| parent | 6bbdbb4447b0a2b5b485ae4351016b05ae79758f (diff) | |
| parent | fd582015fe2bbaabc42f78caefec1bd95f4d1465 (diff) | |
Merged with master
Diffstat (limited to 'src/build_settings.cpp')
| -rw-r--r-- | src/build_settings.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp index 9ecc11cb5..b63f08980 100644 --- a/src/build_settings.cpp +++ b/src/build_settings.cpp @@ -1596,8 +1596,10 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta if (bc->metrics.os == TargetOs_js || bc->metrics.os == TargetOs_wasi) { // TODO(bill): Should these even have a default "heap-like" allocator? } - bc->ODIN_DEFAULT_TO_PANIC_ALLOCATOR = true; - bc->ODIN_DEFAULT_TO_NIL_ALLOCATOR = !bc->ODIN_DEFAULT_TO_PANIC_ALLOCATOR; + + if (!bc->ODIN_DEFAULT_TO_NIL_ALLOCATOR && !bc->ODIN_DEFAULT_TO_PANIC_ALLOCATOR) { + bc->ODIN_DEFAULT_TO_PANIC_ALLOCATOR = true; + } } } |