Skip to content

Commit 8025e1c

Browse files
committed
build: compile bundled uvwasi conditionally
This does the same for `--shared-uvwasi` as nodejs#55886 does for `ada`, `simdjson`, and `simdutf`. Refs: nodejs#55886
1 parent 7beb6fa commit 8025e1c

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
@@ -1098,7 +1098,6 @@
10981098
'dependencies': [
10991099
'<(node_lib_target_name)',
11001100
'deps/histogram/histogram.gyp:histogram',
1101-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11021101
],
11031102
'includes': [
11041103
'node.gypi'
@@ -1109,7 +1108,6 @@
11091108
'deps/v8/include',
11101109
'deps/cares/include',
11111110
'deps/uv/include',
1112-
'deps/uvwasi/include',
11131111
'test/cctest',
11141112
],
11151113
'defines': [
@@ -1122,6 +1120,10 @@
11221120
'test/fuzzers/fuzz_ClientHelloParser.cc',
11231121
],
11241122
'conditions': [
1123+
[ 'node_shared_uvwasi=="false"', {
1124+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1125+
'include_dirs': [ 'deps/uvwasi/include' ],
1126+
}],
11251127
['OS=="linux" or OS=="openharmony"', {
11261128
'ldflags': [ '-fsanitize=fuzzer' ]
11271129
}],
@@ -1142,7 +1144,6 @@
11421144
'<(node_lib_target_name)',
11431145
'deps/googletest/googletest.gyp:gtest_prod',
11441146
'deps/histogram/histogram.gyp:histogram',
1145-
'deps/uvwasi/uvwasi.gyp:uvwasi',
11461147
'deps/nbytes/nbytes.gyp:nbytes',
11471148
],
11481149
'includes': [
@@ -1154,7 +1155,6 @@
11541155
'deps/v8/include',
11551156
'deps/cares/include',
11561157
'deps/uv/include',
1157-
'deps/uvwasi/include',
11581158
'test/cctest',
11591159
],
11601160
'defines': [
@@ -1167,6 +1167,10 @@
11671167
'test/fuzzers/fuzz_strings.cc',
11681168
],
11691169
'conditions': [
1170+
[ 'node_shared_uvwasi=="false"', {
1171+
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
1172+
'include_dirs': [ 'deps/uvwasi/include' ],
1173+
}],
11701174
['OS=="linux" or OS=="openharmony"', {
11711175
'ldflags': [ '-fsanitize=fuzzer' ]
11721176
}],

0 commit comments

Comments
 (0)