Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Commit

Permalink
build: restore intl check for inspector
Browse files Browse the repository at this point in the history
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: #262
Reviewed-By: Kunal Pathak <[email protected]>
  • Loading branch information
kfarnung committed May 25, 2017
1 parent 715c7e0 commit 989ce2d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

{
Expand Down

0 comments on commit 989ce2d

Please sign in to comment.