gyp: implement LINK for ninja #14227

sam-github · 2017-07-13T22:10:41Z

LINK 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.

Without this, ninja can't link node when buliding in FIPS mode, test using ./configure --ninja --openssl-fips=/home/sam/w/core/openssl-fips-2.0.9/canister (obviously, with your own FIPS canister).

Affected core subsystem(s)

crypto, deps, gyp

sam-github · 2017-07-13T22:11:26Z

Based on #14115 (comment), @bnoordhuis , PTAL

refack

Oy

refack · 2017-07-13T22:26:26Z

Feel like pushing it upstream (than I can approve and land it 😈).

sam-github · 2017-07-13T22:40:08Z

@refack where is upstream?

bnoordhuis · 2017-07-13T22:40:56Z

tools/gyp/pylib/gyp/generator/ninja.py

@@ -1927,6 +1927,9 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
    if key == 'CXX.host':
      cxx_host = os.path.join(build_to_root, value)
      cxx_host_global_setting = value
+    if key == 'LINK':
+      ld = os.path.join(build_to_root, value)
+      ldxx = os.path.join(build_to_root, value)


No LINK.host?

refack · 2017-07-13T22:43:54Z

@refack where is upstream?

https://gyp.gsrc.io/docs/Hacking.md

refack · 2017-07-13T22:53:10Z

@sam-github could you post the ninja files before the patch and after (probably just the openSSL)

sam-github · 2017-07-13T23:10:37Z

Without this patch, LINK is completely ignored by the ninja generator, which means that

node/configure

Line 989 in 73078d6

['LINK', fips_ld + ' <(openssl_fips)/bin/fipsld'],

does nothing to build.ninja:

ld = $cc                                                                         
ldxx = $cxx

With this patch, the value of LINK in configure is used to set ld and ldxx in out/Release/build.ninja.

ld = /home/sam/w/core/node/deps/openssl/fips/fipsld /home/sam/w/core/openssl-fips-2.0.9/canister/bin/fipsld
ldxx = /home/sam/w/core/node/deps/openssl/fips/fipsld /home/sam/w/core/openssl-fips-2.0.9/canister/bin/fipsld

Initially, I modified configure itself to set LD in addition to LINK, except that resulted in only ld = being set in the build.ninja, when both ld and ldxx need to be set.

refack · 2017-07-13T23:11:59Z

With this patch, the value of LINK in configure is used to set ld and ldxx in out/Release/build.ninja.

Isn't that too global? or is that the whole point?

sam-github · 2017-07-14T15:01:39Z

That is the whole point, and it is exactly what is done for the normal Makefile commands.

Right now, before this patch:

LINK sets the global link commands for Makefiles
LINK is ignored for ninja
LD sets the global ld command for ninja
nothing at all sets the global ldxx command for ninja, so you are out of luck if you need to set it

I don't understand gyp, maybe its intended that ninja and Makefiles do not share the same gyp variable name to set the link command? If so, then either LDXX needs to be added as a supported gyp var (to set ldxx in ninja), or LD in gyp needs to set both ld and ldxx in ninja.

As someone who doesn't get this entire tottering pile of build tools, I'll take suggestions on what is right!

With this PR, we can build FIPS on Linux with ninja, without it or something like it, we can't.

sam-github · 2017-07-14T15:10:04Z

So, @refack what do you think? LINK sets ld&ldxx? Or leave LINK only for Makefiles, and LD sets ld, and LDXX sets ldxx? Or LD sets ld&ldxx? Which is more gypy/ninjay?

refack · 2017-07-14T15:17:28Z

LINK sets the global link commands for Makefiles

LINK is ignored for ninja

LD sets the global ld command for ninja

nothing at all sets the global ldxx command for ninja, so you are out of luck if you need to set it

IMO:

LINK is probably a Makefile term
I don't see a reason not to implement it for ninja anyway
the LDXX issue is an oversight
You "should" implement LDXX, LDXX.host and LINK.host and write a GYP test if we want to upstream it (as a node floating patch it's good enough as is)

refack · 2017-07-14T15:19:55Z

Which is more gypy/ninjay?

AFAIK ninja has no thumb-rules. All the variables are defined by GYP (ld, cc, cxx etc) so ~~adding~~ borrowing another noun into the GYP.ninja vocabulary seems perfectly legit.

sam-github · 2017-07-14T15:41:13Z

out of curiosity, what does the ".host" mean?

sam-github · 2017-07-14T15:46:46Z

@refack PTAL

refack · 2017-07-14T15:48:29Z

Also perfectly legit. Might be easier to upstream...

refack

Reaffirm

sam-github · 2017-07-14T15:49:59Z

@bnoordhuis LGTY?

bnoordhuis

what does the ".host" mean?

Host toolchain. Relevant when cross-compiling.

refack · 2017-07-15T12:09:40Z

I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)

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 · 2017-07-18T18:35:01Z

For releasers, this was landed with bogus PR-URL metadata.

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: #14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>

sam-github · 2017-07-18T20:41:04Z

@addaleax what is wrong with the metadata? a6cec04 looks right to me

addaleax · 2017-07-18T20:42:17Z

@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)

sam-github · 2017-07-18T20:48:41Z

Oops, yes, I remember now that there was some kind of paste accident. Sorry.

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. PR-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>

refack · 2017-07-18T22:33:52Z

Well I'm re-floating it for #12632 so there it is now fixed

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: #14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@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>

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/node#14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@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: #14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@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/node#14227 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>

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 Jul 13, 2017

sam-github requested a review from bnoordhuis July 13, 2017 22:10

refack approved these changes Jul 13, 2017

View reviewed changes

bnoordhuis reviewed Jul 13, 2017

View reviewed changes

refack approved these changes Jul 14, 2017

View reviewed changes

bnoordhuis approved these changes Jul 14, 2017

View reviewed changes

jasnell approved these changes Jul 14, 2017

View reviewed changes

sam-github force-pushed the ninja-link-support branch from 1e15acf to a6cec04 Compare July 17, 2017 16:38

sam-github merged commit a6cec04 into nodejs:master Jul 17, 2017

sam-github deleted the ninja-link-support branch July 17, 2017 16:41

addaleax mentioned this pull request Jul 18, 2017

v8.2.0 proposal #13744

Merged

MylesBorins added the land-on-v6.x label Aug 16, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gyp: implement LINK for ninja #14227

gyp: implement LINK for ninja #14227

sam-github commented Jul 13, 2017

sam-github commented Jul 13, 2017

refack left a comment

refack commented Jul 13, 2017

sam-github commented Jul 13, 2017

bnoordhuis Jul 13, 2017

refack commented Jul 13, 2017

refack commented Jul 13, 2017

sam-github commented Jul 13, 2017 •

edited

Loading

refack commented Jul 13, 2017

sam-github commented Jul 14, 2017

sam-github commented Jul 14, 2017

refack commented Jul 14, 2017

refack commented Jul 14, 2017 •

edited

Loading

sam-github commented Jul 14, 2017

sam-github commented Jul 14, 2017

refack commented Jul 14, 2017

refack left a comment

sam-github commented Jul 14, 2017

bnoordhuis left a comment

refack commented Jul 15, 2017

addaleax commented Jul 18, 2017

sam-github commented Jul 18, 2017

addaleax commented Jul 18, 2017

sam-github commented Jul 18, 2017

refack commented Jul 18, 2017

gyp: implement LINK for ninja #14227

gyp: implement LINK for ninja #14227

Conversation

sam-github commented Jul 13, 2017

Affected core subsystem(s)

sam-github commented Jul 13, 2017

refack left a comment

Choose a reason for hiding this comment

refack commented Jul 13, 2017

sam-github commented Jul 13, 2017

bnoordhuis Jul 13, 2017

Choose a reason for hiding this comment

refack commented Jul 13, 2017

refack commented Jul 13, 2017

sam-github commented Jul 13, 2017 • edited Loading

refack commented Jul 13, 2017

sam-github commented Jul 14, 2017

sam-github commented Jul 14, 2017

refack commented Jul 14, 2017

refack commented Jul 14, 2017 • edited Loading

sam-github commented Jul 14, 2017

sam-github commented Jul 14, 2017

refack commented Jul 14, 2017

refack left a comment

Choose a reason for hiding this comment

sam-github commented Jul 14, 2017

bnoordhuis left a comment

Choose a reason for hiding this comment

refack commented Jul 15, 2017

addaleax commented Jul 18, 2017

sam-github commented Jul 18, 2017

addaleax commented Jul 18, 2017

sam-github commented Jul 18, 2017

refack commented Jul 18, 2017

sam-github commented Jul 13, 2017 •

edited

Loading

refack commented Jul 14, 2017 •

edited

Loading