mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
eb7a5c2548
* chore: bump node in DEPS to v20.18.3 * src: fix outdated js2c.cc references https://github.com/nodejs/node/pull/56133 * lib: remove startsWith/endsWith primordials for char checks https://github.com/nodejs/node/pull/55407 * test,crypto: make crypto tests work with BoringSSL https://github.com/nodejs/node/pull/55491 * fix: potential WIN32_LEAN_AND_MEAN redefinition https://github.com/c-ares/c-ares/pull/869 * chore: fixup patch indices * deps: update c-ares to v1.34.1 https://github.com/nodejs/node/pull/55369 * chore: fix bssl test --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
43 lines
1.7 KiB
Diff
43 lines
1.7 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 690068f093f12b6831f8ccce41289d02d7047a7a..5a3df388773ad288553bf036be42dc1a0ba75c09 100644
|
|
--- a/common.gypi
|
|
+++ b/common.gypi
|
|
@@ -305,7 +305,7 @@
|
|
'VCCLCompilerTool': {
|
|
'AdditionalOptions': [
|
|
'/Zc:__cplusplus',
|
|
- '-std:c++17'
|
|
+ '-std:c++20'
|
|
],
|
|
'BufferSecurityCheck': 'true',
|
|
'DebugInformationFormat': 1, # /Z7 embed info in .obj files
|
|
@@ -487,7 +487,7 @@
|
|
}],
|
|
[ 'OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
|
|
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],
|
|
- 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ],
|
|
+ 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++20' ],
|
|
'defines': [ '__STDC_FORMAT_MACROS' ],
|
|
'ldflags': [ '-rdynamic' ],
|
|
'target_conditions': [
|
|
@@ -658,7 +658,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++',
|
|
},
|
|
}],
|