diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2017-07-13 15:05:54 -0700 |
---|---|---|
committer | Refael Ackermann <refack@gmail.com> | 2017-08-23 16:24:37 -0400 |
commit | cbd3708c85e13b234e9ded0beaaf1780a537dc39 (patch) | |
tree | 2c991910833e4c6ec3905758b606a14195829010 /tools/gyp | |
parent | 2550152395f48ade5261dcc8d0d63e44acb89702 (diff) | |
download | android-node-v8-cbd3708c85e13b234e9ded0beaaf1780a537dc39.tar.gz android-node-v8-cbd3708c85e13b234e9ded0beaaf1780a537dc39.tar.bz2 android-node-v8-cbd3708c85e13b234e9ded0beaaf1780a537dc39.zip |
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: https://github.com/nodejs/node/pull/14227
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/gyp')
-rw-r--r-- | tools/gyp/pylib/gyp/generator/ninja.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py index 1f67c94500..163281b3e3 100644 --- a/tools/gyp/pylib/gyp/generator/ninja.py +++ b/tools/gyp/pylib/gyp/generator/ninja.py @@ -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': @@ -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)) |