Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream1/main' into config-uvwasi
  • Loading branch information
Teutates committed Jul 25, 2022
commit 4f89c9d5569f141cd42e09e2836aaf179b1b9e8a
2 changes: 2 additions & 0 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,8 @@ def make_bin_override():
configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc'])
configure_library('cares', output, pkgname='libcares')
configure_library('nghttp2', output, pkgname='libnghttp2')
configure_library('nghttp3', output, pkgname='libnghttp3')
configure_library('ngtcp2', output, pkgname='libngtcp2')
configure_library('uvwasi', output, pkgname='libuvwasi')
configure_v8(output)
configure_openssl(output)
Expand Down
3 changes: 3 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,7 @@
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
Expand Down Expand Up @@ -992,6 +993,7 @@
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
Expand Down Expand Up @@ -1104,6 +1106,7 @@
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.