electron/node-gyp
1
0
Fork 0
mirror of https://github.com/electron/node-gyp.git synced 2025-08-15 12:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gyp: use different default compiler for z/OS

Browse source 
PR-URL: https://github.com/nodejs/node-gyp/pull/1768
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
This commit is contained in:
Shuowang (Wayne) Zhang 2019-06-03 11:44:43 -04:00 • committed by Rod Vagg
parent dd9bf929ac
commit 4f4a677dfa
No known key found for this signature in database
GPG key ID: C273792F7D83545D
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gyp/pylib/gyp/generator/make.py
View file

@ -2059,6 +2059,14 @@ def GenerateOutput(target_list, target_dicts, data, params):
'srcdir': srcdir,
'copy_archive_args': copy_archive_arguments,
'makedep_args': makedep_arguments,
'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'),
'AR.target': GetEnvironFallback(('AR_target', 'AR'), '$(AR)'),
'CXX.target': GetEnvironFallback(('CXX_target', 'CXX'), '$(CXX)'),
'LINK.target': GetEnvironFallback(('LINK_target', 'LINK'), '$(LINK)'),
'CC.host': GetEnvironFallback(('CC_host', 'CC'), 'gcc'),
'AR.host': GetEnvironFallback(('AR_host', 'AR'), 'ar'),
'CXX.host': GetEnvironFallback(('CXX_host', 'CXX'), 'g++'),
'LINK.host': GetEnvironFallback(('LINK_host', 'LINK'), '$(CXX.host)'),
}
if flavor == 'mac':
flock_command = './gyp-mac-tool flock'
@ -2079,6 +2087,10 @@ def GenerateOutput(target_list, target_dicts, data, params):
'copy_archive_args': copy_archive_arguments,
'makedep_args': makedep_arguments,
'link_commands': LINK_COMMANDS_OS390,
'CC.target': GetEnvironFallback(('CC_target', 'CC'), 'njsc'),
'CXX.target': GetEnvironFallback(('CXX_target', 'CXX'), 'njsc++'),
'CC.host': GetEnvironFallback(('CC_host', 'CC'), 'njsc'),
'CXX.host': GetEnvironFallback(('CXX_host', 'CXX'), 'njsc++'),
})
elif flavor == 'solaris':
header_params.update({
@ -2104,17 +2116,6 @@ def GenerateOutput(target_list, target_dicts, data, params):
'flock_index': 2,
})
header_params.update({
'CC.target': GetEnvironFallback(('CC_target', 'CC'), '$(CC)'),
'AR.target': GetEnvironFallback(('AR_target', 'AR'), '$(AR)'),
'CXX.target': GetEnvironFallback(('CXX_target', 'CXX'), '$(CXX)'),
'LINK.target': GetEnvironFallback(('LINK_target', 'LINK'), '$(LINK)'),
'CC.host': GetEnvironFallback(('CC_host', 'CC'), 'gcc'),
'AR.host': GetEnvironFallback(('AR_host', 'AR'), 'ar'),
'CXX.host': GetEnvironFallback(('CXX_host', 'CXX'), 'g++'),
'LINK.host': GetEnvironFallback(('LINK_host', 'LINK'), '$(CXX.host)'),
})
build_file, _, _ = gyp.common.ParseQualifiedTarget(target_list[0])
make_global_settings_array = data[build_file].get('make_global_settings', [])
wrappers = {}