mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
fa39ee4bb7
* chore: bump chromium in DEPS to 108.0.5359.4 * chore: update patches * fixup! Change content::PluginList to only run on the UI thread. (cherry picked from commit7b5ec87d4f) Co-Authored-By: Robo <hop2deep@gmail.com> (cherry picked from commit76a618e7d0) * chore: bump chromium in DEPS to 108.0.5359.10 * chore: update patches * fixup printing patch https://github.com/electron/electron/pull/35375 accidentally broke https://github.com/electron/electron/pull/34711 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: VerteDinde <vertedinde@electronjs.org>
|
|
Date: Tue, 1 Mar 2022 12:07:25 -0800
|
|
Subject: build: disable partition alloc on mac
|
|
|
|
Enabling partition alloc caused a crash when spawning
|
|
a child process. This patch disables partition alloc for mac,
|
|
and can be removed when the crash in fork is resolved.
|
|
Related issue: https://github.com/electron/electron/issues/32718
|
|
|
|
diff --git a/build_overrides/partition_alloc.gni b/build_overrides/partition_alloc.gni
|
|
index 44ace8017bdf9ce2ddb996e30ee03dbdc6274fb9..e2ce9f6c57e55f6a9257bb2e58e99895ca52f8c6 100644
|
|
--- a/build_overrides/partition_alloc.gni
|
|
+++ b/build_overrides/partition_alloc.gni
|
|
@@ -40,7 +40,7 @@ _disable_partition_alloc = is_component_build || (is_win && is_debug)
|
|
|
|
# - NaCl: No plans to support it.
|
|
# - iOS: not done yet.
|
|
-_is_partition_alloc_platform = !is_nacl && !is_ios
|
|
+_is_partition_alloc_platform = !is_nacl && !is_ios && !is_mac
|
|
|
|
# Under Windows debug build, the allocator shim is not compatible with CRT.
|
|
# NaCl in particular does seem to link some binaries statically
|