Let's see if this is all that was needed

nodejs · Jul 25, 2022 · c241188 · c241188
1 parent be960b9
commit c241188
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 116 deletions.
diff --git a/configure.py b/configure.py
@@ -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',

diff --git a/node.gyp b/node.gyp
@@ -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
@@ -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',
@@ -929,14 +913,6 @@
         'deps/histogram/histogram.gyp:histogram',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'dependencies': [
-            'deps/uvwasi/uvwasi.gyp:uvwasi'
-          ],
-        }],
-      ],
-
       'includes': [
         'node.gypi'
       ],
@@ -949,14 +925,6 @@
         'test/cctest',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [
         'NODE_ARCH="<(target_arch)"',
         'NODE_PLATFORM="<(OS)"',
@@ -988,14 +956,6 @@
         'deps/histogram/histogram.gyp:histogram',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'dependencies': [
-            'deps/uvwasi/uvwasi.gyp:uvwasi'
-          ],
-        }],
-      ],
-
       'includes': [
         'node.gypi'
       ],
@@ -1009,14 +969,6 @@
         'test/cctest',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [
         'NODE_ARCH="<(target_arch)"',
         'NODE_PLATFORM="<(OS)"',
@@ -1097,14 +1049,6 @@
         'deps/histogram/histogram.gyp:histogram',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'dependencies': [
-            'deps/uvwasi/uvwasi.gyp:uvwasi'
-          ],
-        }],
-      ],
-
       'includes': [
         'node.gypi'
       ],
@@ -1118,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',
@@ -1158,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': [
@@ -1244,14 +1136,6 @@
         'deps/uv/include',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [ 'NODE_WANT_INTERNALS=1' ],
 
       'sources': [

diff --git a/node.gypi b/node.gypi
@@ -196,6 +196,10 @@
       ],
     }],
 
+    [ 'node_shared_uvwasi=="false"', {
+      'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ],
+    }],
+
     [ 'node_shared_nghttp2=="false"', {
       'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
     }],