Skip to content

build: enable building with shared uvwasi lib #43987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Teutates wants to merge 4 commits into from
Closed

build: enable building with shared uvwasi lib #43987

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9f38a3
build: enable building with shared uvwasi lib
PoojaDurgad Nov 25, 2020
6bf4f0d
fixup: address review comments
PoojaDurgad Dec 1, 2020
4f89c9d
Merge remote-tracking branch 'upstream1/main' into config-uvwasi
Teutates Jul 25, 2022
45d7a19
fixup: cleanup after code merge
Teutates Jul 25, 2022
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
fixup: cleanup after code merge 
Second merge fix

Let's see if this is all that was needed

Final final
  • Loading branch information
@Teutates
Teutates committed Jul 25, 2022
commit 45d7a19f3f664468f75bb61579371a75fb396b31
1 change: 1 addition & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@
shared_optgroup.add_argument('--shared-uvwasi',
action='store_true',
dest='shared_uvwasi',
default=None,
help='link to a shared uvwasi DLL instead of static linking')

shared_optgroup.add_argument('--shared-uvwasi-includes',
Expand Down
136 changes: 0 additions & 136 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,14 +163,6 @@
'deps/histogram/histogram.gyp:histogram',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'msvs_settings': {
'VCLinkerTool': {
'GenerateMapFile': 'true', # /MAP
Expand Down Expand Up @@ -462,14 +454,6 @@
'deps/histogram/histogram.gyp:histogram',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'sources': [
'src/api/async_resource.cc',
'src/api/callback.cc',
Expand Down Expand Up @@ -927,18 +911,6 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'includes': [
Expand All @@ -953,14 +925,6 @@
'test/cctest',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'include_dirs': [
'deps/uvwasi/include',
],
}],
],

'defines': [
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
Expand Down Expand Up @@ -990,18 +954,6 @@
'deps/googletest/googletest.gyp:gtest',
'deps/googletest/googletest.gyp:gtest_main',
'deps/histogram/histogram.gyp:histogram',
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'includes': [
Expand All @@ -1017,14 +969,6 @@
'test/cctest',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'include_dirs': [
'deps/uvwasi/include',
],
}],
],

'defines': [
'NODE_ARCH="<(target_arch)"',
'NODE_PLATFORM="<(OS)"',
Expand Down Expand Up @@ -1103,18 +1047,6 @@
'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
'node_dtrace_header',
'node_dtrace_ustack',
'node_dtrace_provider',
'deps/uvwasi/uvwasi.gyp:uvwasi',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'includes': [
Expand All @@ -1130,14 +1062,6 @@
'test/embedding',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'include_dirs': [
'deps/uvwasi/include',
],
}],
],

'sources': [
'src/node_snapshot_stub.cc',
'test/embedding/embedtest.cc',
Expand Down Expand Up @@ -1170,50 +1094,6 @@
'target_name': 'overlapped-checker',
'type': 'executable',

'dependencies': [
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'includes': [
'node.gypi'
],

'include_dirs': [
'src',
'tools/msvs/genfiles',
'deps/v8/include',
'deps/cares/include',
'deps/uv/include',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'include_dirs': [
'deps/uvwasi/include',
],
}],
],

'defines': [
'NODE_WANT_INTERNALS=1'
],
'sources': [
'src/node_snapshot_stub.cc',
'src/node_code_cache_stub.cc',
'tools/code_cache/mkcodecache.cc',
'tools/code_cache/cache_builder.cc',
'tools/code_cache/cache_builder.h',
],

'conditions': [
['OS=="win"', {
'sources': [
Expand All @@ -1235,14 +1115,6 @@
'<(node_lib_target_name)',
'deps/histogram/histogram.gyp:histogram',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'dependencies': [
'deps/uvwasi/uvwasi.gyp:uvwasi'
],
}],
],

'includes': [
'node.gypi'
Expand All @@ -1256,14 +1128,6 @@
'deps/uv/include',
],

'conditions': [
[ 'node_shared_uvwasi=="false"', {
'include_dirs': [
'deps/uvwasi/include',
],
}],
],

'defines': [ 'NODE_WANT_INTERNALS=1' ],

'sources': [
Expand Down
4 changes: 4 additions & 0 deletions node.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@
],
}],

[ 'node_shared_uvwasi=="false"', {
'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
}],

[ 'node_shared_nghttp2=="false"', {
'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
}],
Expand Down