Boost: Compile with toolset=clang for Arm compiler (#11992)

Bootstraps with gcc, but compiles with clang
This commit is contained in:
Nick Forrington 2019-07-11 22:53:54 -04:00 committed by Adam J. Stewart
parent 0dfa5a467c
commit ff728bd06c

View File

@ -201,6 +201,7 @@ def determine_toolset(self, spec):
toolsets = {'g++': 'gcc',
'icpc': 'intel',
'clang++': 'clang',
'armclang++': 'clang',
'xlc++': 'xlcpp',
'xlc++_r': 'xlcpp',
'pgc++': 'pgi'}
@ -228,7 +229,12 @@ def bjam_python_line(self, spec):
def determine_bootstrap_options(self, spec, with_libs, options):
boost_toolset_id = self.determine_toolset(spec)
options.append('--with-toolset=%s' % boost_toolset_id)
# Arm compiler bootstraps with 'gcc' (but builds as 'clang')
if spec.satisfies('%arm'):
options.append('--with-toolset=gcc')
else:
options.append('--with-toolset=%s' % boost_toolset_id)
options.append("--with-libraries=%s" % ','.join(with_libs))
if '+python' in spec: