Skip to content

tools: update GYP to 324dd166 #14718

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
refack merged 7 commits into from
Aug 23, 2017
Merged

tools: update GYP to 324dd166 #14718

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
327077c
tools: update GYP to 324dd166
refack Aug 9, 2017
3debbc7
gyp: fix gyp to work on MacOSX without XCode
Feb 10, 2015
4cc7891
gyp: inherit parent for `*.host`
jbergstroem Apr 13, 2016
503916a
gyp: add compile_commands.json gyp generator
bnoordhuis Aug 5, 2016
e78a79a
gyp: enable cctest to use objects (gyp part)
danbev Oct 18, 2016
2550152
gyp: fix ninja build failure (GYP patch)
danbev Apr 18, 2017
cbd3708
gyp: implement LD/LDXX for ninja and FIPS
sam-github Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
gyp: implement LD/LDXX for ninja and FIPS 
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>
  • Loading branch information
@sam-github @refack
sam-github authored and refack committed Aug 23, 2017
commit cbd3708c85e13b234e9ded0beaaf1780a537dc39
5 changes: 5 additions & 0 deletions tools/gyp/pylib/gyp/generator/ninja.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,10 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
ld = os.path.join(build_to_root, value)
if key == 'LD.host':
ld_host = os.path.join(build_to_root, value)
if key == 'LDXX':
ldxx = os.path.join(build_to_root, value)
if key == 'LDXX.host':
ldxx_host = os.path.join(build_to_root, value)
if key == 'NM':
nm = os.path.join(build_to_root, value)
if key == 'NM.host':
Expand Down Expand Up @@ -2024,6 +2028,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
CommandWithWrapper('CXX.host', wrappers, cxx_host))
if flavor == 'win':
master_ninja.variable('ld_host', ld_host)
master_ninja.variable('ldxx_host', ldxx_host)
else:
master_ninja.variable('ld_host', CommandWithWrapper(
'LINK', wrappers, ld_host))
Expand Down