Commit 5d92202
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,6 +7,7 @@ | |||
| 7 | 7 | 'targets': [ | |
| 8 | 8 | { | |
| 9 | 9 | 'target_name': 'simdutf', | |
| 10 | + 'toolsets': ['host', 'target'], | ||
| 10 | 11 | 'type': 'static_library', | |
| 11 | 12 | 'include_dirs': ['.'], | |
| 12 | 13 | 'direct_dependent_settings': { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -162,6 +162,7 @@ | |||
| 162 | 162 | 'targets': [ | |
| 163 | 163 | { | |
| 164 | 164 | 'target_name': 'libuv', | |
| 165 | + 'toolsets': ['host', 'target'], | ||
| 165 | 166 | 'type': '<(uv_library)', | |
| 166 | 167 | 'include_dirs': [ | |
| 167 | 168 | 'include', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,7 +27,7 @@ | |||
| 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. | |
@@ -362,6 +362,7 @@ | |||
| 362 | 362 | 'src/quic/transportparams.h', | |
| 363 | 363 | ], | |
| 364 | 364 | 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', | |
| 365 | + 'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)', | ||
| 365 | 366 | 'conditions': [ | |
| 366 | 367 | ['GENERATOR == "ninja"', { | |
| 367 | 368 | 'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o' | |
@@ -770,6 +771,7 @@ | |||
| 770 | 771 | 'deps/uvwasi/uvwasi.gyp:uvwasi', | |
| 771 | 772 | 'deps/simdutf/simdutf.gyp:simdutf', | |
| 772 | 773 | 'deps/ada/ada.gyp:ada', | |
| 774 | + 'node_js2c#host', | ||
| 773 | 775 | ], | |
| 774 | 776 | ||
| 775 | 777 | 'sources': [ | |
@@ -925,8 +927,7 @@ | |||
| 925 | 927 | 'action_name': 'node_js2c', | |
| 926 | 928 | 'process_outputs_as_sources': 1, | |
| 927 | 929 | 'inputs': [ | |
| 928 | - # Put the code first so it's a dependency and can be used for invocation. | ||
| 929 | - 'tools/js2c.py', | ||
| 930 | + '<(node_js2c_exec)', | ||
| 930 | 931 | '<@(library_files)', | |
| 931 | 932 | '<@(deps_files)', | |
| 932 | 933 | 'config.gypi' | |
@@ -935,12 +936,9 @@ | |||
| 935 | 936 | '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc', | |
| 936 | 937 | ], | |
| 937 | 938 | 'action': [ | |
| 938 | - '<(python)', | ||
| 939 | - 'tools/js2c.py', | ||
| 940 | - '--directory', | ||
| 941 | - 'lib', | ||
| 942 | - '--target', | ||
| 939 | + '<(node_js2c_exec)', | ||
| 943 | 940 | '<@(_outputs)', | |
| 941 | + 'lib', | ||
| 944 | 942 | 'config.gypi', | |
| 945 | 943 | '<@(deps_files)', | |
| 946 | 944 | ], | |
@@ -1179,8 +1177,9 @@ | |||
| 1179 | 1177 | { | |
| 1180 | 1178 | 'target_name': 'node_js2c', | |
| 1181 | 1179 | 'type': 'executable', | |
| 1180 | + 'toolsets': ['host'], | ||
| 1182 | 1181 | 'dependencies': [ | |
| 1183 | - 'deps/simdutf/simdutf.gyp:simdutf', | ||
| 1182 | + 'deps/simdutf/simdutf.gyp:simdutf#host', | ||
| 1184 | 1183 | ], | |
| 1185 | 1184 | 'include_dirs': [ | |
| 1186 | 1185 | 'tools' | |
@@ -1191,7 +1190,7 @@ | |||
| 1191 | 1190 | ], | |
| 1192 | 1191 | 'conditions': [ | |
| 1193 | 1192 | [ 'node_shared_libuv=="false"', { | |
| 1194 | - 'dependencies': [ 'deps/uv/uv.gyp:libuv' ], | ||
| 1193 | + 'dependencies': [ 'deps/uv/uv.gyp:libuv#host' ], | ||
| 1195 | 1194 | }], | |
| 1196 | 1195 | [ 'debug_node=="true"', { | |
| 1197 | 1196 | 'cflags!': [ '-O3' ], | |
This file was deleted.
This file was deleted.
0 commit comments