fixup: cleanup after code merge

Second merge fix

Let's see if this is all that was needed

Final final

Author: Teutates

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',

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',
@@ -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': [
@@ -953,14 +925,6 @@
         'test/cctest',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [
         'NODE_ARCH="<(target_arch)"',
         'NODE_PLATFORM="<(OS)"',
@@ -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': [
@@ -1017,14 +969,6 @@
         'test/cctest',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [
         'NODE_ARCH="<(target_arch)"',
         'NODE_PLATFORM="<(OS)"',
@@ -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': [
@@ -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',
@@ -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': [
@@ -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'
@@ -1256,14 +1128,6 @@
         'deps/uv/include',
       ],
 
-      'conditions': [
-        [ 'node_shared_uvwasi=="false"', {
-          'include_dirs': [
-            'deps/uvwasi/include',
-          ],
-        }],
-      ],
-
       'defines': [ 'NODE_WANT_INTERNALS=1' ],
 
       'sources': [

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' ],
     }],