GeezerVison is showing github.com — build: compile with C++20 support · nodejs/node@e4b1874
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Makefile +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -171,7 +171,7 @@ endif | 171 | 171 | with-code-cache test-code-cache: | 172 | 172 | $(warning '$@' target is a noop) | 173 | 173 |
| 174 | | -out/Makefile: config.gypi common.gypi node.gyp \ | | 174 | +out/Makefile: config.gypi common.gypi common_node.gypi node.gyp \ | 175 | 175 | deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \ | 176 | 176 | deps/simdutf/simdutf.gyp deps/ada/ada.gyp \ | 177 | 177 | tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ | |
Collapse file Copy file name to clipboard +16Lines changed: 16 additions & 0 deletions | 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 | +} |
Collapse file Copy file name to clipboardExpand all lines: node.gyp +2Lines changed: 2 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 862 | 862 | '<@(deps_files)', | 863 | 863 | # node.gyp is added by default, common.gypi is added for change detection | 864 | 864 | 'common.gypi', | | 865 | + 'common_node.gypi', | 865 | 866 | ], | 866 | 867 |
| 867 | 868 | 'variables': { | | 1349 | 1350 | '<@(library_files)', | 1350 | 1351 | '<@(deps_files)', | 1351 | 1352 | 'common.gypi', | | 1353 | + 'common_node.gypi', | 1352 | 1354 | ], | 1353 | 1355 | 'direct_dependent_settings': { | 1354 | 1356 | 'ldflags': [ '-Wl,-brtl' ], | |
Collapse file Copy file name to clipboardExpand all lines: tools/create_android_makefiles +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -37,6 +37,7 @@ export GYP_DEFINES | 37 | 37 |
| 38 | 38 | ./deps/npm/node_modules/node-gyp/gyp/gyp \ | 39 | 39 | -Icommon.gypi \ | | 40 | + -Icommon_node.gypi \ | 40 | 41 | -Iconfig.gypi \ | 41 | 42 | --depth=. \ | 42 | 43 | -Dcomponent=static_library \ | |
Collapse file Copy file name to clipboardExpand all lines: tools/gyp_node.py +4Lines changed: 4 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -20,11 +20,15 @@ def run_gyp(args): | 20 | 20 | a_path = node_root if sys.platform == 'win32' else os.path.abspath(node_root) | 21 | 21 | args.append(os.path.join(a_path, 'node.gyp')) | 22 | 22 | common_fn = os.path.join(a_path, 'common.gypi') | | 23 | + common_node_fn = os.path.join(a_path, 'common_node.gypi') | 23 | 24 | options_fn = os.path.join(a_path, 'config.gypi') | 24 | 25 |
| 25 | 26 | if os.path.exists(common_fn): | 26 | 27 | args.extend(['-I', common_fn]) | 27 | 28 |
| | 29 | + if os.path.exists(common_node_fn): | | 30 | + args.extend(['-I', common_node_fn]) | | 31 | + | 28 | 32 | if os.path.exists(options_fn): | 29 | 33 | args.extend(['-I', options_fn]) | 30 | 34 |
| |
|