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

Commit 989ce2d

Browse files
committed
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: #262 Reviewed-By: Kunal Pathak <[email protected]>
1 parent 715c7e0 commit 989ce2d

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@ def configure_intl(o):
13071307

13081308
def configure_inspector(o):
13091309
disable_inspector = (options.without_inspector or
1310+
options.with_intl in (None, 'none') or
13101311
options.without_ssl)
13111312
o['variables']['v8_enable_inspector'] = 0 if disable_inspector else 1
13121313

src/node.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4789,7 +4789,7 @@ inline int Start_TTDReplay(Isolate* isolate, void* isolate_context,
47894789
// Start debug agent when argv has --debug
47904790
StartDebug(&env, nullptr, debug_options);
47914791

4792-
if (debug_options.inspector_enabled())
4792+
if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env))
47934793
return 12; // Signal internal error.
47944794

47954795
{

0 commit comments

Comments
 (0)