Skip to content
Open
Changes from all commits
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
12 changes: 6 additions & 6 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@
action='store_true',
dest='enable_static',
default=None,
help='build as static library')
help=argparse.SUPPRESS) # Deprecated

parser.add_argument('--no-browser-globals',
action='store_true',
Expand Down Expand Up @@ -2081,9 +2081,6 @@ def configure_node(o):
if options.v8_options:
o['variables']['node_v8_options'] = options.v8_options.replace('"', '\\"')

if options.enable_static:
o['variables']['node_target_type'] = 'static_library'

o['variables']['node_debug_lib'] = b(options.node_debug_lib)

if options.debug_nghttp2:
Expand Down Expand Up @@ -2126,10 +2123,13 @@ def configure_node(o):
else:
o['variables']['coverage'] = 'false'

if options.enable_static and options.shared:
error('--enable-static must not be set with --shared')
if options.enable_static:
warn('--enable-static is deprecated and libnode.a is always produced')

if options.shared:
o['variables']['node_target_type'] = 'shared_library'
elif options.enable_static:
o['variables']['node_target_type'] = 'static_library'
else:
o['variables']['node_target_type'] = 'executable'

Expand Down
Loading