Skip to content

Commit a4a8ed8

Browse files
carlocabtargos
authored andcommitted
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

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
@@ -1092,7 +1092,6 @@
10921092
'dependencies': [
10931093
'<(node_lib_target_name)',
10941094
'deps/histogram/histogram.gyp:histogram',
1095-
'deps/uvwasi/uvwasi.gyp:uvwasi',
10961095
],
10971096
'includes': [
10981097
'node.gypi'
@@ -1103,7 +1102,6 @@
11031102
'deps/v8/include',
11041103
'deps/cares/include',
11051104
'deps/uv/include',
1106-
'deps/uvwasi/include',
11071105
'test/cctest',
11081106
],
11091107
'defines': [
@@ -1116,6 +1114,10 @@
11161114
'test/fuzzers/fuzz_ClientHelloParser.cc',
11171115
],
11181116
'conditions': [
1117+
[ 'node_shared_uvwasi=="false"', {
1118+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1119+
'include_dirs': [ 'deps/uvwasi/include' ],
1120+
}],
11191121
['OS=="linux" or OS=="openharmony"', {
11201122
'ldflags': [ '-fsanitize=fuzzer' ]
11211123
}],
@@ -1136,7 +1138,6 @@
11361138
'<(node_lib_target_name)',
11371139
'deps/googletest/googletest.gyp:gtest_prod',
11381140
'deps/histogram/histogram.gyp:histogram',
1139-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11401141
'deps/nbytes/nbytes.gyp:nbytes',
11411142
],
11421143
'includes': [
@@ -1148,7 +1149,6 @@
11481149
'deps/v8/include',
11491150
'deps/cares/include',
11501151
'deps/uv/include',
1151-
'deps/uvwasi/include',
11521152
'test/cctest',
11531153
],
11541154
'defines': [
@@ -1161,6 +1161,10 @@
11611161
'test/fuzzers/fuzz_strings.cc',
11621162
],
11631163
'conditions': [
1164+
[ 'node_shared_uvwasi=="false"', {
1165+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1166+
'include_dirs': [ 'deps/uvwasi/include' ],
1167+
}],
11641168
['OS=="linux" or OS=="openharmony"', {
11651169
'ldflags': [ '-fsanitize=fuzzer' ]
11661170
}],

0 commit comments

Comments
 (0)