Fix V8 patch - #9610
Merged
MylesBorins merged 2 commits intoNov 17, 2016
Merged
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
2 tasks
bnoordhuis
approved these changes
Nov 15, 2016
bnoordhuis
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM. It's odd the patch in v6.x deviates from the original but it's also fairly harmless.
Sorry, something went wrong.
ofrobots
approved these changes
Nov 15, 2016
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
I still don't understand the full sequence of events, but this is mostly harmless. On V8 master the force_dynamic_crt variable initialization is in toolchain.gypi. LGTM, no strong feelings either way.
Sorry, something went wrong.
Copy link
Copy Markdown
Contributor
Author
Sorry, something went wrong.
mhdawson
approved these changes
Nov 17, 2016
mhdawson
left a comment
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
LGTM . given that this improves consistently across releases.
Sorry, something went wrong.
Original Commit Message: "build: cherry pick V8 change for windows DLL support" This reverts commit 92ecbc4. The original commit did not include the entire changeset
Original commit message: [build] Add force_dynamic_crt option to build a static library with /… …MD on windows Adds option to build a V8 library statically, but with the options on windows that allows it to be subsequently included in another DLL. On Windows this is required for it to correclty link against the correct C++ runtime. Require for our Node.js shared library build. Reference: nodejs#7487 BUG= R=machenbach@chromium.org, michael_dawson@ca.ibm.com Committed: https://crrev.com/9cf88c1c364cf76c1e745aa63196768435e8ef5d Review-Url: https://codereview.chromium.org/2149963002 Cr-Original-Commit-Position: refs/heads/master@{nodejs#37814} Cr-Commit-Position: refs/heads/master@{nodejs#37856} Ref: nodejs#7802 Ref: nodejs#8084 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
MylesBorins
force-pushed
the
fix-v8-patch
branch
from
f940c00 to
fb635f6
Compare
November 17, 2016 19:50
MylesBorins
pushed a commit
that referenced
this pull request
Nov 17, 2016
Original Commit Message: "build: cherry pick V8 change for windows DLL support" This reverts commit 92ecbc4. The original commit did not include the entire changeset PR-URL: #9610 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
MylesBorins
pushed a commit
that referenced
this pull request
Nov 17, 2016
Original commit message: [build] Add force_dynamic_crt option to build a static library with /… …MD on windows Adds option to build a V8 library statically, but with the options on windows that allows it to be subsequently included in another DLL. On Windows this is required for it to correclty link against the correct C++ runtime. Require for our Node.js shared library build. Reference: #7487 BUG= R=machenbach@chromium.org, michael_dawson@ca.ibm.com Committed: https://crrev.com/9cf88c1c364cf76c1e745aa63196768435e8ef5d Review-Url: https://codereview.chromium.org/2149963002 Cr-Original-Commit-Position: refs/heads/master@{#37814} Cr-Commit-Position: refs/heads/master@{#37856} Ref: #7802 Ref: #8084 PR-URL: #9610 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Copy link
Copy Markdown
Contributor
Author
|
UGHHHH this is failing on v4.x with the error gyp: name 'force_dynamic_crt' is not defined while evaluating condition 'component=="shared_library" or force_dynamic_crt==1' in /Users/thealphanerd/code/node/v4.x/deps/v8/tools/gyp/v8.gyp while loading dependencies of /Users/thealphanerd/code/node/v4.x/node.gyp while trying to load /Users/thealphanerd/code/node/v4.x/node.gyp Error running GYP Likely need another patch to get this to work. Will open backport specific for v4 |
Sorry, something went wrong.
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
7 participants
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.
This is a particularly weird fix and I ask that @nodejs/lts @nodejs/ctc @nodejs/v8 all take a look and make sure that I'm not off here.
While auditing a backport we were digging into a V8 change that apparantly landed in v6.x during the upgrade to V8 5.1 in cd77ca3, a backport of ofrobots@33c9578
Unfortunately that commit didn't change anything other than the patch number of V8 as the to change had already landed in v6.x as 92ecbc4
This wouldn't be an issue, except for the fact that neither of these commits backported the exact changeset from the V8 tracker, specifically the changes to deps/v8/build/standalone.gypi . The change is instead found inside of toolchain.gypi with no explanation as to why this was done.
The original backport ofrobots@33c9578 also references the wrong commit sha from V8, but that is pretty minor compared to missing part of the change set.
Phew.
So this PR attempts to rectify everything, as long as there is anything that actually needs to be rectified. To be honest I am a bit confused by the subtle difference. If I am mistaken and the changeset that we currently have is what we want I will close this, but we should try to avoid landing V8 changes without the proper meta data going forward so we can avoid confusion like this.