Skip to content

Commit

Permalink
gyp: use different default compiler for z/OS
Browse files Browse the repository at this point in the history
PR-URL: #1768
Reviewed-By: Richard Lau <[email protected]>
  • Loading branch information
zsw007 authored and rvagg committed Jun 21, 2019
1 parent dd9bf92 commit 4f4a677
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions gyp/pylib/gyp/generator/make.py
Original file line number Diff line number Diff line change
Expand Up @@ -2059,6 +2059,14 @@ def CalculateMakefilePath(build_file, base_name):
'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'
Expand All @@ -2079,6 +2087,10 @@ def CalculateMakefilePath(build_file, base_name):
'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({
Expand All @@ -2104,17 +2116,6 @@ def CalculateMakefilePath(build_file, base_name):
'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 = {}
Expand Down

0 comments on commit 4f4a677

Please sign in to comment.