|
27 | 27 | 'node_lib_target_name%': 'libnode',
|
28 | 28 | 'node_intermediate_lib_type%': 'static_library',
|
29 | 29 | 'node_builtin_modules_path%': '',
|
30 |
| - # We list the deps/ files out instead of globbing them in js2c.py since we |
| 30 | + # We list the deps/ files out instead of globbing them in js2c.cc since we |
31 | 31 | # only include a subset of all the files under these directories.
|
32 | 32 | # The lengths of their file names combined should not exceed the
|
33 | 33 | # Windows command length limit or there would be an error.
|
|
52 | 52 | '<@(node_builtin_shareable_builtins)',
|
53 | 53 | ],
|
54 | 54 | 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
|
| 55 | + 'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)', |
55 | 56 | 'conditions': [
|
56 | 57 | ['GENERATOR == "ninja"', {
|
57 | 58 | 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
|
|
460 | 461 | 'deps/uvwasi/uvwasi.gyp:uvwasi',
|
461 | 462 | 'deps/simdutf/simdutf.gyp:simdutf',
|
462 | 463 | 'deps/ada/ada.gyp:ada',
|
| 464 | + 'node_js2c#host', |
463 | 465 | ],
|
464 | 466 |
|
465 | 467 | 'sources': [
|
|
891 | 893 | 'action_name': 'node_js2c',
|
892 | 894 | 'process_outputs_as_sources': 1,
|
893 | 895 | 'inputs': [
|
894 |
| - # Put the code first so it's a dependency and can be used for invocation. |
895 |
| - 'tools/js2c.py', |
| 896 | + '<(node_js2c_exec)', |
896 | 897 | '<@(library_files)',
|
897 | 898 | '<@(deps_files)',
|
898 | 899 | 'config.gypi'
|
|
901 | 902 | '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
|
902 | 903 | ],
|
903 | 904 | 'action': [
|
904 |
| - '<(python)', |
905 |
| - 'tools/js2c.py', |
906 |
| - '--directory', |
907 |
| - 'lib', |
908 |
| - '--target', |
| 905 | + '<(node_js2c_exec)', |
909 | 906 | '<@(_outputs)',
|
| 907 | + 'lib', |
910 | 908 | 'config.gypi',
|
911 | 909 | '<@(deps_files)',
|
912 | 910 | ],
|
|
1126 | 1124 | {
|
1127 | 1125 | 'target_name': 'node_js2c',
|
1128 | 1126 | 'type': 'executable',
|
| 1127 | + 'toolsets': ['host'], |
1129 | 1128 | 'dependencies': [
|
1130 |
| - 'deps/simdutf/simdutf.gyp:simdutf', |
| 1129 | + 'deps/simdutf/simdutf.gyp:simdutf#host', |
1131 | 1130 | ],
|
1132 | 1131 | 'include_dirs': [
|
1133 | 1132 | 'tools'
|
|
1138 | 1137 | ],
|
1139 | 1138 | 'conditions': [
|
1140 | 1139 | [ 'node_shared_libuv=="false"', {
|
1141 |
| - 'dependencies': [ 'deps/uv/uv.gyp:libuv' ], |
| 1140 | + 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], |
1142 | 1141 | }],
|
1143 | 1142 | [ 'debug_node=="true"', {
|
1144 | 1143 | 'cflags!': [ '-O3' ],
|
|
0 commit comments