Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit ba23506

Browse filesBrowse files
bnoordhuisMylesBorins
authored andcommitted
build: --without-ssl implies --without-inspector
This cherry-picks the changes to `configure` from commit 8f00455 ("inspector: switch to new inspector APIs") from the master branch and should unbreak `--without-ssl` builds. Refs: #12155 PR-URL: #12200 Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent f874256 commit ba23506
Copy full SHA for ba23506

File tree

Expand file treeCollapse file tree

1 file changed

+7
-1
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-1
lines changed
Open diff view settings
Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,6 @@ def configure_node(o):
894894
o['variables']['library_files'] = options.linked_module
895895

896896
o['variables']['asan'] = int(options.enable_asan or 0)
897-
o['variables']['v8_inspector'] = b(not options.without_inspector)
898897
o['variables']['debug_devtools'] = 'node'
899898

900899
if options.use_xcode and options.use_ninja:
@@ -1268,6 +1267,12 @@ def configure_intl(o):
12681267
pprint.pformat(icu_config, indent=2) + '\n')
12691268
return # end of configure_intl
12701269

1270+
def configure_inspector(o):
1271+
disable_inspector = (options.without_inspector or
1272+
options.with_intl in (None, 'none') or
1273+
options.without_ssl)
1274+
o['variables']['v8_inspector'] = b(not disable_inspector)
1275+
12711276
output = {
12721277
'variables': {},
12731278
'include_dirs': [],
@@ -1298,6 +1303,7 @@ configure_v8(output)
12981303
configure_openssl(output)
12991304
configure_intl(output)
13001305
configure_static(output)
1306+
configure_inspector(output)
13011307

13021308
# variables should be a root level element,
13031309
# move everything else to target_defaults

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.