File tree Expand file tree Collapse file tree 5 files changed +24
-1
lines changed Expand file tree Collapse file tree 5 files changed +24
-1
lines changed Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ endif
171171with-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 \
Original file line number Diff line number Diff line change 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+ }
Original file line number Diff line number Diff line change 844844 '<@(deps_files)' ,
845845 # node.gyp is added by default, common.gypi is added for change detection
846846 'common.gypi' ,
847+ 'common_node.gypi' ,
847848 ],
848849
849850 'variables' : {
13291330 '<@(library_files)' ,
13301331 '<@(deps_files)' ,
13311332 'common.gypi' ,
1333+ 'common_node.gypi' ,
13321334 ],
13331335 'direct_dependent_settings' : {
13341336 'ldflags' : [ '-Wl,-brtl' ],
Original file line number Diff line number Diff 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 \
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments