Merged
Conversation
Contributor
Author
|
/cc @nodejs/build @nodejs/python |
2 tasks
Contributor
Author
|
/cc @bnoordhuis @nodejs/platform-windows @nodejs/node-chakracore @JaneaSystems anyone feels like reviewing 🙌 |
jasnell
approved these changes
Aug 16, 2017
2 tasks
Contributor
Author
|
CI: https://ci.nodejs.org/job/node-test-commit/11909/ Resumed: https://ci.nodejs.org/job/node-test-commit/11930/ ✔️ |
Member
|
CI is green. |
Contributor
Author
|
Landing |
PR-URL: nodejs#14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: refack/GYP3@324dd16 Reviewed-By: James M Snell <jasnell@gmail.com>
This issue has already submitted to the upstream in https://code.google.com/p/gyp/issues/detail?id=477 Use this commit until the upstream is to be fixed. PR-URL: nodejs#1325 Reviewed-By: Fedor Indutny <fedor@indutny.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Gyp defaults to gcc/g++ if CC.host/CXX.host is unset. This is not suitable for environments that only uses the clang toolchain. Since we already assume that the user will provide clang/clang++ through CC/CXX, lean against it (then drop to gcc/g++). Also apply the same logic for link/ar for consistency although it doesn't affect us. PR-URL: nodejs#6173 Fixes: nodejs#6152 Reviewed-By: João Reis <reis@janeasystems.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
this is a re-base of the gyp part of 3c46bb9 after bumping GYP version to https://chromium.googlesource.com/external/gyp/+/eb296f67da078ec01f5e3a9ea9cdc6d26d680161 Original-Review-By: James M Snell <jasnell@gmail.com> Ref: nodejs#7986 PR-URL: nodejs#12450 Reviewed-By: João Reis <reis@janeasystems.com>
this is a re-base of the gyp part of 6a09a69 after bumping GYP version to https://chromium.googlesource.com/external/gyp/+/eb296f67da078ec01f5e3a9ea9cdc6d26d680161 Original-PR-URL: nodejs#11956 Original-Ref: nodejs#9163 Original-Reviewed-By: James M Snell <jasnell@gmail.com> PR-URL: nodejs#12450 Reviewed-By: João Reis <reis@janeasystems.com>
Currently the files specified in libraries in node.gyp `cctest` target are getting a '.lib' extension on windows when generated with ninja. This commit adds a check to see if a file has a '.obj' extension and in that case no '.lib' extension will be added. Also, the LIBS specified in the 'libraries' section are not being included in the --start-group --end-group section which means that these libraries will not be searched causing issue with linkers where the order matters. PR-URL: nodejs#12484 Fixes: nodejs#12448 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
The ability to set the link rule is used for FIPS, and needs to set both the `ld =` and `ldxx =` variables in the ninja build file to link c++ (node) and c (openssl-cli, etc.) executables. URL: nodejs#14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
addaleax
pushed a commit
to addaleax/ayo
that referenced
this pull request
Aug 25, 2017
PR-URL: nodejs/node#14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: refack/GYP3@324dd16 Reviewed-By: James M Snell <jasnell@gmail.com>
addaleax
pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
PR-URL: nodejs/node#14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: refack/GYP3@324dd16 Reviewed-By: James M Snell <jasnell@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Sep 10, 2017
PR-URL: #14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: refack/GYP3@324dd16 Reviewed-By: James M Snell <jasnell@gmail.com>
Merged
MylesBorins
pushed a commit
that referenced
this pull request
Sep 12, 2017
PR-URL: #14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: refack/GYP3@324dd16 Reviewed-By: James M Snell <jasnell@gmail.com>
Contributor
|
Should this be backported to v6.x? If so it may need to be done manually, have not yet checked |
Contributor
|
ping @nodejs/build @nodejs/node-gyp |
Contributor
Author
|
Not critical. Mostly support for new OSes and platforms. |
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
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.
vendor these new commits
Then refloat:
*.hostChecklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
tools,gyp