diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2017-07-13 15:05:54 -0700 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2017-07-17 09:36:23 -0700 |
| commit | a6cec04aaaf4e0d6d51adb7f4485e6f1a69f6d5d (patch) | |
| tree | f3522ae9c0693e658ccf4df21260ef90cc602835 /tools/gyp | |
| parent | 649d77bbf4e01e3dd3799ff8ca8d190641c9f4da (diff) | |
| download | android-node-v8-a6cec04aaaf4e0d6d51adb7f4485e6f1a69f6d5d.tar.gz android-node-v8-a6cec04aaaf4e0d6d51adb7f4485e6f1a69f6d5d.tar.bz2 android-node-v8-a6cec04aaaf4e0d6d51adb7f4485e6f1a69f6d5d.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)) |