Skip to content

Commit 273e72d

Browse files
legendecasaduh95
authored andcommitted
build: deprecate always enabled --enable-static
`libnode.a` is now always produced, unless configured with flag `--shared`. This deprecates the no-op flag `--enable-static`. Signed-off-by: Chengzhong Wu <cwu631@bloomberg.net> PR-URL: #65103 Refs: #65026 Refs: #63626 Reviewed-By: Richard Lau <richard.lau@ibm.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 60bfa16 commit 273e72d

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

configure.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@
10151015
action='store_true',
10161016
dest='enable_static',
10171017
default=None,
1018-
help='build as static library')
1018+
help=argparse.SUPPRESS) # Deprecated
10191019

10201020
parser.add_argument('--no-browser-globals',
10211021
action='store_true',
@@ -1862,9 +1862,6 @@ def configure_node(o):
18621862
if options.v8_options:
18631863
o['variables']['node_v8_options'] = options.v8_options.replace('"', '\\"')
18641864

1865-
if options.enable_static:
1866-
o['variables']['node_target_type'] = 'static_library'
1867-
18681865
o['variables']['node_debug_lib'] = b(options.node_debug_lib)
18691866

18701867
if options.debug_nghttp2:
@@ -1907,10 +1904,13 @@ def configure_node(o):
19071904
else:
19081905
o['variables']['coverage'] = 'false'
19091906

1907+
if options.enable_static and options.shared:
1908+
error('--enable-static must not be set with --shared')
1909+
if options.enable_static:
1910+
warn('--enable-static is deprecated and libnode.a is always produced')
1911+
19101912
if options.shared:
19111913
o['variables']['node_target_type'] = 'shared_library'
1912-
elif options.enable_static:
1913-
o['variables']['node_target_type'] = 'static_library'
19141914
else:
19151915
o['variables']['node_target_type'] = 'executable'
19161916

0 commit comments

Comments
 (0)