From ba23506419a0c8f58507b4219fbaea06f448f79f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 4 Apr 2017 09:40:32 +0200 Subject: [PATCH] build: --without-ssl implies --without-inspector This cherry-picks the changes to `configure` from commit 8f00455c5 ("inspector: switch to new inspector APIs") from the master branch and should unbreak `--without-ssl` builds. Refs: https://github.com/nodejs/node/issues/12155 PR-URL: https://github.com/nodejs/node/pull/12200 Reviewed-By: Sakthipriyan Vairamani Reviewed-By: James M Snell Reviewed-By: Colin Ihrig --- configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 74229bf1120998..e7fa06fe87f6f6 100755 --- a/configure +++ b/configure @@ -894,7 +894,6 @@ def configure_node(o): o['variables']['library_files'] = options.linked_module o['variables']['asan'] = int(options.enable_asan or 0) - o['variables']['v8_inspector'] = b(not options.without_inspector) o['variables']['debug_devtools'] = 'node' if options.use_xcode and options.use_ninja: @@ -1268,6 +1267,12 @@ def configure_intl(o): pprint.pformat(icu_config, indent=2) + '\n') return # end of configure_intl +def configure_inspector(o): + disable_inspector = (options.without_inspector or + options.with_intl in (None, 'none') or + options.without_ssl) + o['variables']['v8_inspector'] = b(not disable_inspector) + output = { 'variables': {}, 'include_dirs': [], @@ -1298,6 +1303,7 @@ configure_v8(output) configure_openssl(output) configure_intl(output) configure_static(output) +configure_inspector(output) # variables should be a root level element, # move everything else to target_defaults