Skip to content

Commit 207e5aa

Browse files
sam-githubrvagg
authored andcommittedAug 9, 2018
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: 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>
1 parent b416c5f commit 207e5aa

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed
 

‎gyp/pylib/gyp/generator/ninja.py

+5
Original file line numberDiff line numberDiff line change
@@ -1873,6 +1873,10 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
18731873
ld = os.path.join(build_to_root, value)
18741874
if key == 'LD.host':
18751875
ld_host = os.path.join(build_to_root, value)
1876+
if key == 'LDXX':
1877+
ldxx = os.path.join(build_to_root, value)
1878+
if key == 'LDXX.host':
1879+
ldxx_host = os.path.join(build_to_root, value)
18761880
if key == 'NM':
18771881
nm = os.path.join(build_to_root, value)
18781882
if key == 'NM.host':
@@ -1962,6 +1966,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
19621966
CommandWithWrapper('CXX.host', wrappers, cxx_host))
19631967
if flavor == 'win':
19641968
master_ninja.variable('ld_host', ld_host)
1969+
master_ninja.variable('ldxx_host', ldxx_host)
19651970
else:
19661971
master_ninja.variable('ld_host', CommandWithWrapper(
19671972
'LINK', wrappers, ld_host))

0 commit comments

Comments
 (0)
Please sign in to comment.