mirror of
https://github.com/electron/electron.git
synced 2026-02-19 03:14:51 -05:00
fix: restore macos 12 support in Node 24 (#49702)
* fix: restore macos 12 support in Node 24 Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> * chore: fix rebased patch list * chore: fixup patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <vertedinde@electronjs.org> Co-authored-by: Niklas Wenzel <dev@nikwen.de>
This commit is contained in:
@@ -43,3 +43,4 @@ src_use_cp_utf8_for_wide_file_names_on_win32.patch
|
||||
fix_ensure_traverseparent_bails_on_resource_path_exit.patch
|
||||
reland_temporal_unflag_temporal.patch
|
||||
src_handle_der_decoding_errors_from_system_certificates.patch
|
||||
build_restore_macos_deployment_target_to_12_0.patch
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Keeley Hammond <vertedinde@electronjs.org>
|
||||
Date: Thu, 5 Feb 2026 15:29:44 -0800
|
||||
Subject: build: restore macos deployment target to 12.0
|
||||
|
||||
Partially reverts https://github.com/nodejs/node/commit/8b4022177750530d2c142a5a0349d98fb82f16e2
|
||||
Electron will follow Chromium's lead and deprecate macos 12 with
|
||||
M151, and so we should allow for building until then.
|
||||
|
||||
This patch can be removed at the M151 branch point.
|
||||
|
||||
diff --git a/common.gypi b/common.gypi
|
||||
index c08f65b0448806c613b27eb91f9dd512adab938c..58ae004bc3e9cc6fa36330bb7bfd67bb8e46336c 100644
|
||||
--- a/common.gypi
|
||||
+++ b/common.gypi
|
||||
@@ -677,7 +677,7 @@
|
||||
'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
|
||||
'GCC_STRICT_ALIASING': 'NO', # -fno-strict-aliasing
|
||||
'PREBINDING': 'NO', # No -Wl,-prebind
|
||||
- 'MACOSX_DEPLOYMENT_TARGET': '13.5', # -mmacosx-version-min=13.5
|
||||
+ 'MACOSX_DEPLOYMENT_TARGET': '12.0', # -mmacosx-version-min=12.0
|
||||
'USE_HEADERMAP': 'NO',
|
||||
'WARNING_CFLAGS': [
|
||||
'-Wall',
|
||||
Reference in New Issue
Block a user