This repository has been archived by the owner on Oct 15, 2020. It is now read-only.
build: restore intl check for inspector #262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Here's the potential upstream PR: kfarnung/node@0345651 |
kunalspathak
approved these changes
May 25, 2017
|
Replaced my fix with the fix from an in-progress PR. It's approved by @bnoordhuis, so we'll use that to get us past the issue. |
kfarnung
added a commit
to kfarnung/node-chakracore
that referenced
this pull request
May 25, 2017
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
Currently the InspectorStarted function is guarded by the else clause of
the NODE_USE_V8_PLATFORM macro. If node is configured --without-ssl then
NODE_USE_V8_PLATFORM will be 1 but the nested HAVE_INSPECTOR macro
will not be 0 which will lead to that there will be no InspectorStarted
function defined.
If building --without-inspector or --without-ssl the following
compilation error will occur:
../src/node.cc:4470:57: error: no member named 'InspectorStarted' in
'node::(anonymous struct at ../src/node.cc:241:8)'
if (debug_options.inspector_enabled() &&
!v8_platform.InspectorStarted(&env))
~~~~~~~~~~~ ^
../src/node.cc:4470:57: error: no member named 'InspectorStarted' in
'node::(anonymous struct at ../src/node.cc:241:8)'
if (debug_options.inspector_enabled() &&
!v8_platform.InspectorStarted(&env))
~~~~~~~~~~~ ^
1 error generated.
This commit adds a separate if preprocessor directive to catch the case
when either --without-ssl/--without-inspector and --without-v8-platform
combinations are used to configure node.
PR-URL: nodejs/node#13167
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
kfarnung
added a commit
to kfarnung/node-chakracore
that referenced
this pull request
May 31, 2017
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
kfarnung
added a commit
to kfarnung/node-chakracore
that referenced
this pull request
May 31, 2017
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
kfarnung
added a commit
to kfarnung/node-chakracore
that referenced
this pull request
May 31, 2017
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
kfarnung
added a commit
to kfarnung/node-chakracore
that referenced
this pull request
Jun 5, 2017
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: nodejs#262 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
off. Restoring that check so that without-intl builds will succeed.
submit upstream PR.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
build, src