gyp: implement LINK for ninja - #14227

Merged
sam-github merged 1 commit into
nodejs:masterfrom
sam-github:ninja-link-support
Jul 17, 2017
Merged

gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom
sam-github:ninja-link-support

Conversation

@sam-github

@sam-githubsam-github commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

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

@nodejs-github-botnodejs-github-bot added build Issues and PRs related to Node.js builds or CI infrastructure. tools Issues and PRs related to the tools directory. labels Jul 13, 2017
@sam-github

sam-github commented Jul 13, 2017

Copy link
Copy Markdown
ContributorAuthor

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

refack
refack approved these changes Jul 13, 2017
View reviewed changes

@refackrefack left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy

@refack

refack commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

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

@sam-github

sam-github commented Jul 13, 2017

Copy link
Copy Markdown
ContributorAuthor

@refack where is upstream?

bnoordhuis
bnoordhuis reviewed Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?

@refack

refack commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

@refack where is upstream?

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

@refack

refack commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

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

@sam-github

sam-github commented Jul 13, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

refack commented Jul 13, 2017

Copy link
Copy Markdown
Contributor

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

sam-github commented Jul 14, 2017

Copy link
Copy Markdown
ContributorAuthor

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

sam-github commented Jul 14, 2017

Copy link
Copy Markdown
ContributorAuthor

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

refack commented Jul 14, 2017

Copy link
Copy Markdown
Contributor
  • 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

refack commented Jul 14, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

sam-github commented Jul 14, 2017

Copy link
Copy Markdown
ContributorAuthor

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

@sam-github

sam-github commented Jul 14, 2017

Copy link
Copy Markdown
ContributorAuthor

@refack PTAL

@refack

refack commented Jul 14, 2017

Copy link
Copy Markdown
Contributor

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

refack
refack approved these changes Jul 14, 2017
View reviewed changes

@refackrefack left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm

@sam-github

sam-github commented Jul 14, 2017

Copy link
Copy Markdown
ContributorAuthor

@bnoordhuis LGTY?

bnoordhuis
bnoordhuis approved these changes Jul 14, 2017
View reviewed changes

@bnoordhuisbnoordhuis left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?

Host toolchain. Relevant when cross-compiling.

@refack

refack commented Jul 15, 2017

Copy link
Copy Markdown
Contributor

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

@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github merged commit a6cec04 into nodejs:masterJul 17, 2017
@sam-github
sam-github deleted the ninja-link-support branch July 17, 2017 16:41
@addaleax

addaleax commented Jul 18, 2017

Copy link
Copy Markdown
Member

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

@addaleaxaddaleax mentioned this pull request Jul 18, 2017
Merged
addaleax pushed a commit that referenced this pull request Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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

sam-github commented Jul 18, 2017

Copy link
Copy Markdown
ContributorAuthor

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

@addaleax

addaleax commented Jul 18, 2017

Copy link
Copy Markdown
Member

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

@sam-github

sam-github commented Jul 18, 2017

Copy link
Copy Markdown
ContributorAuthor

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

refack pushed a commit to refack/node that referenced this pull request Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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

refack commented Jul 18, 2017

Copy link
Copy Markdown
Contributor

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

Fishrock123 pushed a commit that referenced this pull request Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit that referenced this pull request Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit that referenced this pull request Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit to refack/node that referenced this pull request Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit to ayojs/ayo that referenced this pull request Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit that referenced this pull request Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit that referenced this pull request Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit to nodejs/node-gyp that referenced this pull request Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit to nodejs/node-gyp that referenced this pull request Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes
+1 more reviewer
@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
gyp: implement LINK for ninja - #14227
Merged
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Jul 17, 2017
Merged
gyp: implement LINK for ninja#14227
sam-github merged 1 commit into
nodejs:masterfrom 
sam-github:ninja-link-support
Conversation
@sam-github
@sam-githubsam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
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
@nodejs-github-botnodejs-github-bot
added

build
Issues and PRs related to Node.js builds or CI infrastructure.
tools
Issues and PRs related to the tools directory.
labels
Jul 13, 2017
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
Based on #14115 (comment), @bnoordhuis , PTAL
refack
refack
approved these changes
Jul 13, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oy
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
Feel like pushing it upstream (than I can approve and land it 😈).
@sam-github
sam-github
commented
Jul 13, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack where is upstream?
bnoordhuis
bnoordhuis
reviewed
Jul 13, 2017
View reviewed changes
Comment threadtools/gyp/pylib/gyp/generator/ninja.py
Outdated

@bnoordhuisbnoordhuisJul 13, 2017

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No LINK.host?
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@refack where is upstream?
https://gyp.gsrc.io/docs/Hacking.md
@refack
refack
commented
Jul 13, 2017

Copy link


Copy Markdown

Contributor
@sam-github could you post the ninja files before the patch and after (probably just the openSSL)
@sam-github
sam-github
commented
Jul 13, 2017•

edited

Loading

Copy link


Copy Markdown

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

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
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
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
  • 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
refack
commented
Jul 14, 2017•

edited

Loading

Copy link


Copy Markdown

Contributor
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
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
out of curiosity, what does the ".host" mean?
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@refack PTAL
@refack
refack
commented
Jul 14, 2017

Copy link


Copy Markdown

Contributor
Also perfectly legit. Might be easier to upstream...
refack
refack
approved these changes
Jul 14, 2017
View reviewed changes
@refackrefack
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reaffirm
@sam-github
sam-github
commented
Jul 14, 2017

Copy link


Copy Markdown

ContributorAuthor
@bnoordhuis LGTY?
bnoordhuis
bnoordhuis
approved these changes
Jul 14, 2017
View reviewed changes
@bnoordhuisbnoordhuis
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the ".host" mean?
Host toolchain. Relevant when cross-compiling.
@refack
refack
commented
Jul 15, 2017

Copy link


Copy Markdown

Contributor
I'm not sure which side of the LINK/LD+LDXX this points to but I've found this: indutny/gyp.js#37 (comment)
@sam-github
gyp: implement LD/LDXX for ninja and FIPS
a6cec04
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>
@sam-github
sam-github
merged commit a6cec04
into
nodejs:masterJul 17, 2017
@sam-github
sam-github
deleted the

ninja-link-support

branch
July 17, 2017 16:41
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
For releasers, this was landed with bogus PR-URL metadata.
@addaleaxaddaleax
mentioned this pull request
Jul 18, 2017
 Merged

addaleax pushed a commit
that referenced
this pull request
Jul 18, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
4587f21
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
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
@addaleax what is wrong with the metadata? a6cec04 looks right to me
@addaleax
addaleax
commented
Jul 18, 2017

Copy link


Copy Markdown

Member
@sam-github It’s just a typo, the PR-URL: is missing the PR- part :)
@sam-github
sam-github
commented
Jul 18, 2017

Copy link


Copy Markdown

ContributorAuthor
Oops, yes, I remember now that there was some kind of paste accident. Sorry.
refack pushed a commit
to refack/node
that referenced
this pull request
Jul 18, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
ce4f27c
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
refack
commented
Jul 18, 2017

Copy link


Copy Markdown

Contributor
Well I'm re-floating it for #12632 so there it is now fixed
Fishrock123 pushed a commit
that referenced
this pull request
Jul 19, 2017
@sam-github@Fishrock123
gyp: implement LD/LDXX for ninja and FIPS
2b86e6b
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
a2f2038
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>
MylesBorins pushed a commit
that referenced
this pull request
Aug 16, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
01d7d30
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>
refack pushed a commit
to refack/node
that referenced
this pull request
Aug 23, 2017
@sam-github@refack
gyp: implement LD/LDXX for ninja and FIPS
cbd3708
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
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
80dc490
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>
addaleax pushed a commit
to ayojs/ayo
that referenced
this pull request
Aug 28, 2017
@sam-github@addaleax
gyp: implement LD/LDXX for ninja and FIPS
1204c73
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 3, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
4c33bd1
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>
MylesBorins pushed a commit
that referenced
this pull request
Sep 5, 2017
@sam-github@MylesBorins
gyp: implement LD/LDXX for ninja and FIPS
f8b60e4
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
f739c18
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>
rvagg pushed a commit
to nodejs/node-gyp
that referenced
this pull request
Aug 9, 2018
@sam-github@rvagg
gyp: implement LD/LDXX for ninja and FIPS
207e5aa
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>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@bnoordhuisbnoordhuisbnoordhuis approved these changes
@jasnelljasnelljasnell approved these changes

+1 more reviewer

@refackrefackrefack approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees


No one assigned


Labels

buildIssues and PRs related to Node.js builds or CI infrastructure.toolsIssues and PRs related to the tools directory.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

7 participants

@sam-github@refack@addaleax@bnoordhuis@jasnell@MylesBorins@nodejs-github-bot