Commit a4a8ed8
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 c206f8d commit a4a8ed8
1 file changed
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1092,7 +1092,6 @@ | |||
| 1092 | 1092 | 'dependencies': [ | |
| 1093 | 1093 | '<(node_lib_target_name)', | |
| 1094 | 1094 | 'deps/histogram/histogram.gyp:histogram', | |
| 1095 | - 'deps/uvwasi/uvwasi.gyp:uvwasi', | ||
| 1096 | 1095 | ], | |
| 1097 | 1096 | 'includes': [ | |
| 1098 | 1097 | 'node.gypi' | |
@@ -1103,7 +1102,6 @@ | |||
| 1103 | 1102 | 'deps/v8/include', | |
| 1104 | 1103 | 'deps/cares/include', | |
| 1105 | 1104 | 'deps/uv/include', | |
| 1106 | - 'deps/uvwasi/include', | ||
| 1107 | 1105 | 'test/cctest', | |
| 1108 | 1106 | ], | |
| 1109 | 1107 | 'defines': [ | |
@@ -1116,6 +1114,10 @@ | |||
| 1116 | 1114 | 'test/fuzzers/fuzz_ClientHelloParser.cc', | |
| 1117 | 1115 | ], | |
| 1118 | 1116 | 'conditions': [ | |
| 1117 | + [ 'node_shared_uvwasi=="false"', { | ||
| 1118 | + 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | ||
| 1119 | + 'include_dirs': [ 'deps/uvwasi/include' ], | ||
| 1120 | + }], | ||
| 1119 | 1121 | ['OS=="linux" or OS=="openharmony"', { | |
| 1120 | 1122 | 'ldflags': [ '-fsanitize=fuzzer' ] | |
| 1121 | 1123 | }], | |
@@ -1136,7 +1138,6 @@ | |||
| 1136 | 1138 | '<(node_lib_target_name)', | |
| 1137 | 1139 | 'deps/googletest/googletest.gyp:gtest_prod', | |
| 1138 | 1140 | 'deps/histogram/histogram.gyp:histogram', | |
| 1139 | - 'deps/uvwasi/uvwasi.gyp:uvwasi', | ||
| 1140 | 1141 | 'deps/nbytes/nbytes.gyp:nbytes', | |
| 1141 | 1142 | ], | |
| 1142 | 1143 | 'includes': [ | |
@@ -1148,7 +1149,6 @@ | |||
| 1148 | 1149 | 'deps/v8/include', | |
| 1149 | 1150 | 'deps/cares/include', | |
| 1150 | 1151 | 'deps/uv/include', | |
| 1151 | - 'deps/uvwasi/include', | ||
| 1152 | 1152 | 'test/cctest', | |
| 1153 | 1153 | ], | |
| 1154 | 1154 | 'defines': [ | |
@@ -1161,6 +1161,10 @@ | |||
| 1161 | 1161 | 'test/fuzzers/fuzz_strings.cc', | |
| 1162 | 1162 | ], | |
| 1163 | 1163 | 'conditions': [ | |
| 1164 | + [ 'node_shared_uvwasi=="false"', { | ||
| 1165 | + 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | ||
| 1166 | + 'include_dirs': [ 'deps/uvwasi/include' ], | ||
| 1167 | + }], | ||
| 1164 | 1168 | ['OS=="linux" or OS=="openharmony"', { | |
| 1165 | 1169 | 'ldflags': [ '-fsanitize=fuzzer' ] | |
| 1166 | 1170 | }], | |
0 commit comments