Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e4b1874

Browse filesBrowse files
committed
build: compile with C++20 support
PR-URL: #52838 Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
1 parent 8fbf662 commit e4b1874
Copy full SHA for e4b1874

File tree

Expand file treeCollapse file tree

5 files changed

+24
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

5 files changed

+24
-1
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ endif
171171
with-code-cache test-code-cache:
172172
$(warning '$@' target is a noop)
173173

174-
out/Makefile: config.gypi common.gypi node.gyp \
174+
out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \
175175
deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
176176
deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
177177
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
Collapse file

‎common_node.gypi‎

Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
'target_defaults': {
3+
'conditions': [
4+
# Override common.gypi config to use C++20 for Node.js core only.
5+
['OS in "linux freebsd openbsd solaris android aix os400 cloudabi"', {
6+
'cflags_cc!': ['-std=gnu++17'],
7+
'cflags_cc': ['-std=gnu++20'],
8+
}],
9+
['OS=="mac" and clang==1', {
10+
'xcode_settings': {
11+
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++20', # -std=gnu++20
12+
},
13+
}],
14+
],
15+
},
16+
}
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@
862862
'<@(deps_files)',
863863
# node.gyp is added by default, common.gypi is added for change detection
864864
'common.gypi',
865+
'common_node.gypi',
865866
],
866867

867868
'variables': {
@@ -1349,6 +1350,7 @@
13491350
'<@(library_files)',
13501351
'<@(deps_files)',
13511352
'common.gypi',
1353+
'common_node.gypi',
13521354
],
13531355
'direct_dependent_settings': {
13541356
'ldflags': [ '-Wl,-brtl' ],
Collapse file

‎tools/create_android_makefiles‎

Copy file name to clipboardExpand all lines: tools/create_android_makefiles
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ export GYP_DEFINES
3737

3838
./deps/npm/node_modules/node-gyp/gyp/gyp \
3939
-Icommon.gypi \
40+
-Icommon_node.gypi \
4041
-Iconfig.gypi \
4142
--depth=. \
4243
-Dcomponent=static_library \
Collapse file

‎tools/gyp_node.py‎

Copy file name to clipboardExpand all lines: tools/gyp_node.py
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ def run_gyp(args):
2020
a_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root)
2121
args.append(os.path.join(a_path, 'node.gyp'))
2222
common_fn = os.path.join(a_path, 'common.gypi')
23+
common_node_fn = os.path.join(a_path, 'common_node.gypi')
2324
options_fn = os.path.join(a_path, 'config.gypi')
2425

2526
if os.path.exists(common_fn):
2627
args.extend(['-I', common_fn])
2728

29+
if os.path.exists(common_node_fn):
30+
args.extend(['-I', common_node_fn])
31+
2832
if os.path.exists(options_fn):
2933
args.extend(['-I', options_fn])
3034

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.