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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -985,8 +985,11 @@ def configure_openssl(o): o['variables']['openssl_fips'] = options.openssl_fips fips_dir = os.path.join(root_dir, 'deps', 'openssl', 'fips') fips_ld = os.path.abspath(os.path.join(fips_dir, 'fipsld')) + # LINK is for Makefiles, LD/LDXX is for ninja o['make_fips_settings'] = [ ['LINK', fips_ld + ' <(openssl_fips)/bin/fipsld'], + ['LD', fips_ld + ' <(openssl_fips)/bin/fipsld'], + ['LDXX', fips_ld + ' <(openssl_fips)/bin/fipsld'], ] else: o['variables']['openssl_fips'] = '' |