Commit 50174cb
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 5506f77 commit 50174cb
1 file changed
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1101,7 +1101,7 @@ | |||
| 1101 | 1101 | action='store_true', | |
| 1102 | 1102 | dest='enable_static', | |
| 1103 | 1103 | default=None, | |
| 1104 | - help='build as static library') | ||
| 1104 | + help=argparse.SUPPRESS) # Deprecated | ||
| 1105 | 1105 | ||
| 1106 | 1106 | parser.add_argument('--no-browser-globals', | |
| 1107 | 1107 | action='store_true', | |
@@ -2075,9 +2075,6 @@ def configure_node(o): | |||
| 2075 | 2075 | if options.v8_options: | |
| 2076 | 2076 | o['variables']['node_v8_options'] = options.v8_options.replace('"', '\\"') | |
| 2077 | 2077 | ||
| 2078 | - if options.enable_static: | ||
| 2079 | - o['variables']['node_target_type'] = 'static_library' | ||
| 2080 | - | ||
| 2081 | 2078 | o['variables']['node_debug_lib'] = b(options.node_debug_lib) | |
| 2082 | 2079 | ||
| 2083 | 2080 | if options.debug_nghttp2: | |
@@ -2120,10 +2117,13 @@ def configure_node(o): | |||
| 2120 | 2117 | else: | |
| 2121 | 2118 | o['variables']['coverage'] = 'false' | |
| 2122 | 2119 | ||
| 2120 | + if options.enable_static and options.shared: | ||
| 2121 | + error('--enable-static must not be set with --shared') | ||
| 2122 | + if options.enable_static: | ||
| 2123 | + warn('--enable-static is deprecated and libnode.a is always produced') | ||
| 2124 | + | ||
| 2123 | 2125 | if options.shared: | |
| 2124 | 2126 | o['variables']['node_target_type'] = 'shared_library' | |
| 2125 | - elif options.enable_static: | ||
| 2126 | - o['variables']['node_target_type'] = 'static_library' | ||
| 2127 | 2127 | else: | |
| 2128 | 2128 | o['variables']['node_target_type'] = 'executable' | |
| 2129 | 2129 | ||
0 commit comments