aboutsummaryrefslogtreecommitdiff
path: root/src/build_settings.cpp
diff options
context:
space:
mode:
authorLaytan Laats <laytanlaats@hotmail.com>2024-04-28 16:05:41 +0200
committerLaytan Laats <laytanlaats@hotmail.com>2024-04-28 16:05:41 +0200
commit4fea5720a52b726671a1e6f8e9acfe0ee2569972 (patch)
treea90f21dbb2103b626b2be2436b646b6200b4f5b6 /src/build_settings.cpp
parent30cfdd73b0cf6df7bf04f0f17a91fd6450ba7f73 (diff)
wasm: allow `-default-to-nil-allocator`
Diffstat (limited to 'src/build_settings.cpp')
-rw-r--r--src/build_settings.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 3bd362996..8509394ff 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -1583,8 +1583,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;
+ }
}
}