From 989ce2d09b9be6d29f0bea472879a4447771149d Mon Sep 17 00:00:00 2001 From: Kyle Farnung Date: Wed, 24 May 2017 16:29:12 -0700 Subject: [PATCH] build: restore intl check for inspector Upstream has a check that turns off inspector if intl is also turned off. Restoring that check so that without-intl builds will succeed. PR-URL: https://github.com/nodejs/node-chakracore/pull/262 Reviewed-By: Kunal Pathak --- configure | 1 + src/node.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d9676a8d8d7..c16ee257431 100755 --- a/configure +++ b/configure @@ -1307,6 +1307,7 @@ def configure_intl(o): def configure_inspector(o): disable_inspector = (options.without_inspector or + options.with_intl in (None, 'none') or options.without_ssl) o['variables']['v8_enable_inspector'] = 0 if disable_inspector else 1 diff --git a/src/node.cc b/src/node.cc index d75c1d0a701..b57dcd9ec6b 100644 --- a/src/node.cc +++ b/src/node.cc @@ -4789,7 +4789,7 @@ inline int Start_TTDReplay(Isolate* isolate, void* isolate_context, // Start debug agent when argv has --debug StartDebug(&env, nullptr, debug_options); - if (debug_options.inspector_enabled()) + if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env)) return 12; // Signal internal error. {