Skip to content

Commit 4e0af20

Browse files
authored
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 <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
1 parent ebd2da6 commit 4e0af20

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

node.gyp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,6 @@
10961096
'dependencies': [
10971097
'<(node_lib_target_name)',
10981098
'deps/histogram/histogram.gyp:histogram',
1099-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11001099
],
11011100
'includes': [
11021101
'node.gypi'
@@ -1107,7 +1106,6 @@
11071106
'deps/v8/include',
11081107
'deps/cares/include',
11091108
'deps/uv/include',
1110-
'deps/uvwasi/include',
11111109
'test/cctest',
11121110
],
11131111
'defines': [
@@ -1120,6 +1118,10 @@
11201118
'test/fuzzers/fuzz_ClientHelloParser.cc',
11211119
],
11221120
'conditions': [
1121+
[ 'node_shared_uvwasi=="false"', {
1122+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1123+
'include_dirs': [ 'deps/uvwasi/include' ],
1124+
}],
11231125
['OS=="linux" or OS=="openharmony"', {
11241126
'ldflags': [ '-fsanitize=fuzzer' ]
11251127
}],
@@ -1140,7 +1142,6 @@
11401142
'<(node_lib_target_name)',
11411143
'deps/googletest/googletest.gyp:gtest_prod',
11421144
'deps/histogram/histogram.gyp:histogram',
1143-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11441145
'deps/nbytes/nbytes.gyp:nbytes',
11451146
],
11461147
'includes': [
@@ -1152,7 +1153,6 @@
11521153
'deps/v8/include',
11531154
'deps/cares/include',
11541155
'deps/uv/include',
1155-
'deps/uvwasi/include',
11561156
'test/cctest',
11571157
],
11581158
'defines': [
@@ -1165,6 +1165,10 @@
11651165
'test/fuzzers/fuzz_strings.cc',
11661166
],
11671167
'conditions': [
1168+
[ 'node_shared_uvwasi=="false"', {
1169+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1170+
'include_dirs': [ 'deps/uvwasi/include' ],
1171+
}],
11681172
['OS=="linux" or OS=="openharmony"', {
11691173
'ldflags': [ '-fsanitize=fuzzer' ]
11701174
}],

0 commit comments

Comments
 (0)