Commit e430464
build: compile bundled uvwasi conditionally
This does the same for `--shared-uvwasi` as #55886 does for `ada`,
`simdjson`, and `simdutf`.
Refs: #55886
PR-URL: #59622
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>1 parent 24428fc commit e430464
1 file changed
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1086,7 +1086,6 @@ | |||
| 1086 | 1086 | 'dependencies': [ | |
| 1087 | 1087 | '<(node_lib_target_name)', | |
| 1088 | 1088 | 'deps/histogram/histogram.gyp:histogram', | |
| 1089 | - 'deps/uvwasi/uvwasi.gyp:uvwasi', | ||
| 1090 | 1089 | ], | |
| 1091 | 1090 | 'includes': [ | |
| 1092 | 1091 | 'node.gypi' | |
@@ -1097,7 +1096,6 @@ | |||
| 1097 | 1096 | 'deps/v8/include', | |
| 1098 | 1097 | 'deps/cares/include', | |
| 1099 | 1098 | 'deps/uv/include', | |
| 1100 | - 'deps/uvwasi/include', | ||
| 1101 | 1099 | 'test/cctest', | |
| 1102 | 1100 | ], | |
| 1103 | 1101 | 'defines': [ | |
@@ -1110,6 +1108,10 @@ | |||
| 1110 | 1108 | 'test/fuzzers/fuzz_ClientHelloParser.cc', | |
| 1111 | 1109 | ], | |
| 1112 | 1110 | 'conditions': [ | |
| 1111 | + [ 'node_shared_uvwasi=="false"', { | ||
| 1112 | + 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | ||
| 1113 | + 'include_dirs': [ 'deps/uvwasi/include' ], | ||
| 1114 | + }], | ||
| 1113 | 1115 | ['OS=="linux" or OS=="openharmony"', { | |
| 1114 | 1116 | 'ldflags': [ '-fsanitize=fuzzer' ] | |
| 1115 | 1117 | }], | |
@@ -1130,7 +1132,6 @@ | |||
| 1130 | 1132 | '<(node_lib_target_name)', | |
| 1131 | 1133 | 'deps/googletest/googletest.gyp:gtest_prod', | |
| 1132 | 1134 | 'deps/histogram/histogram.gyp:histogram', | |
| 1133 | - 'deps/uvwasi/uvwasi.gyp:uvwasi', | ||
| 1134 | 1135 | 'deps/nbytes/nbytes.gyp:nbytes', | |
| 1135 | 1136 | ], | |
| 1136 | 1137 | 'includes': [ | |
@@ -1142,7 +1143,6 @@ | |||
| 1142 | 1143 | 'deps/v8/include', | |
| 1143 | 1144 | 'deps/cares/include', | |
| 1144 | 1145 | 'deps/uv/include', | |
| 1145 | - 'deps/uvwasi/include', | ||
| 1146 | 1146 | 'test/cctest', | |
| 1147 | 1147 | ], | |
| 1148 | 1148 | 'defines': [ | |
@@ -1155,6 +1155,10 @@ | |||
| 1155 | 1155 | 'test/fuzzers/fuzz_strings.cc', | |
| 1156 | 1156 | ], | |
| 1157 | 1157 | 'conditions': [ | |
| 1158 | + [ 'node_shared_uvwasi=="false"', { | ||
| 1159 | + 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | ||
| 1160 | + 'include_dirs': [ 'deps/uvwasi/include' ], | ||
| 1161 | + }], | ||
| 1158 | 1162 | ['OS=="linux" or OS=="openharmony"', { | |
| 1159 | 1163 | 'ldflags': [ '-fsanitize=fuzzer' ] | |
| 1160 | 1164 | }], | |
0 commit comments