mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
db8e94113b
* chore: bump node in DEPS to v22.22.1 * chore: update patches * chore: fixup remove_obsolete_noarraybufferzerofillscope.patch * deps: update simdjson to 4.2.4 https://github.com/nodejs/node/pull/61056 * fix: generate_config_gypi needs to generate valid JSON https: //github.com/nodejs/node/pull/60794 (cherry picked from commita1d06cdd8a) Co-Authored-By: Shelley Vohr <shelley.vohr@gmail.com> * src: fix off-thread cert loading in bundled cert mode https://github.com/nodejs/node/pull/60764 (cherry picked from commitcb4deec8f0) This test fails on boringssl incompatibilities: https://github.com/electron/electron/pull/49744/changes#r2799802487 Co-Authored-By: Shelley Vohr <shelley.vohr@gmail.com> * test: move sea tests into test/sea https://github.com/nodejs/node/pull/60250 (cherry picked from commit695929b66a) * src: fix off-thread cert loading in bundled cert mode nodejs/node#60764 The Node.js cli flag --use-bundled-ca is not supported in Electron --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <kleinschmidtorama@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Wed, 4 Sep 2024 16:39:23 +0200
|
|
Subject: build: compile with C++20 support
|
|
|
|
Refs https://github.com/nodejs/node/pull/45427
|
|
|
|
V8 requires C++20 support as of https://chromium-review.googlesource.com/c/v8/v8/+/5587859.
|
|
|
|
This can be removed when Electron upgrades to a version of Node.js containing the required V8 version.
|
|
|
|
diff --git a/common.gypi b/common.gypi
|
|
index 4cb925480961ae88eb423559ab34ac0ee91239e4..bbfc0f4ec293df19662e57fa4890c4c53cd79d75 100644
|
|
--- a/common.gypi
|
|
+++ b/common.gypi
|
|
@@ -536,7 +536,7 @@
|
|
'-fno-rtti',
|
|
'-fno-exceptions',
|
|
'-fno-strict-aliasing',
|
|
- '-std=gnu++17',
|
|
+ '-std=gnu++20',
|
|
],
|
|
'defines': [ '__STDC_FORMAT_MACROS' ],
|
|
'ldflags': [ '-rdynamic' ],
|
|
@@ -716,7 +716,7 @@
|
|
['clang==1', {
|
|
'xcode_settings': {
|
|
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
|
|
- 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++17', # -std=gnu++17
|
|
+ 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++20', # -std=gnu++20
|
|
'CLANG_CXX_LIBRARY': 'libc++',
|
|
},
|
|
}],
|