Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: update GYP to 324dd166 #14718

Merged
merged 7 commits into from
Aug 23, 2017
Merged

tools: update GYP to 324dd166 #14718

merged 7 commits into from
Aug 23, 2017

Conversation

refack
Copy link
Contributor

@refack refack commented Aug 9, 2017

vendor these new commits

SHA message
324dd16 gyp: show descriptive Windows SDK detection error by Jaime Bernardo
4801a53 gyp: update xml string encoding conversion by Refael Ackermann
d61a939 mac_tool.py: Handle non-zero ibtool return code. by Michail Pishchagin
a478c1a win: mkdir even when copying directory by Refael Ackermann
ffd524c win ninja/make: Always use a native compiler executable with MSVS 2017 by Mark Mentovai
e885024 Fix MSVC++ 32-on-32 builds after b62d04ff85e6 by Mark Mentovai
8dc7724 Disable flaky test/copies/gyptest-all under msvs. by Dirk Pranke
b62d04f win,ninja: ninja generator better on windows by Refael Ackermann
ae76d91 Clean up gyptest.py. by Dirk Pranke
a94b02e Disable a bunch of tests on Mac. by Dirk Pranke
19495aa Update test/no-cpp/gyptest-no-cpp. by Dirk Pranke

Then refloat:

Autor Message SHA
shigeki gyp: fix gyp to work on MacOSX without XCode 3681071
jbergstroem gyp: inherit parent for *.host d50702d
bnoordhuis gyp: add compile_commands.json gyp generator fa3220d
danbev gyp: enable cctest to use objects (gyp part) 649ab2b
danbev gyp: fix ninja build failure (GYP patch) 4c22050
sam-github gyp: implement LD/LDXX for ninja and FIPS 8d96a25
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

tools,gyp

@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. tools Issues and PRs related to the tools directory. labels Aug 9, 2017
@refack
Copy link
Contributor Author

refack commented Aug 9, 2017

/cc @nodejs/build @nodejs/python

@refack refack added the python PRs and issues that require attention from people who are familiar with Python. label Aug 15, 2017
@refack
Copy link
Contributor Author

refack commented Aug 15, 2017

/cc @bnoordhuis @nodejs/platform-windows @nodejs/node-chakracore @JaneaSystems anyone feels like reviewing 🙌

@refack
Copy link
Contributor Author

refack commented Aug 19, 2017

CI: https://ci.nodejs.org/job/node-test-commit/11909/
(only infra problems, but since this is build related, I want to see this build with FIPS and on maxOS)

Resumed: https://ci.nodejs.org/job/node-test-commit/11930/ ✔️

@jasnell
Copy link
Member

jasnell commented Aug 23, 2017

CI is green.

@refack
Copy link
Contributor Author

refack commented Aug 23, 2017

Landing

refack and others added 7 commits August 23, 2017 16:24
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 <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
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 <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
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 <[email protected]>
Ref: nodejs#7986
PR-URL: nodejs#12450
Reviewed-By: João Reis <[email protected]>
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 <[email protected]>

PR-URL: nodejs#12450
Reviewed-By: João Reis <[email protected]>
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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
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 <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@refack refack merged commit cbd3708 into nodejs:master Aug 23, 2017
@refack
Copy link
Contributor Author

refack commented Aug 23, 2017

Landed in:
327077c
3debbc7
4cc7891
503916a
e78a79a
2550152
cbd3708

@MylesBorins
Copy link
Contributor

Should this be backported to v6.x? If so it may need to be done manually, have not yet checked

@MylesBorins
Copy link
Contributor

ping @nodejs/build @nodejs/node-gyp

@refack
Copy link
Contributor Author

refack commented Oct 16, 2017

Not critical. Mostly support for new OSes and platforms.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issues and PRs related to build files or the CI. python PRs and issues that require attention from people who are familiar with Python. tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants