Skip to content

Commit

Permalink
Boost: Compile with toolset=clang for Arm compiler (spack#11992)
Browse files Browse the repository at this point in the history
Bootstraps with gcc, but compiles with clang
  • Loading branch information
NickRF authored and adamjstewart committed Jul 12, 2019
1 parent 0dfa5a4 commit ff728bd
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion var/spack/repos/builtin/packages/boost/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit ff728bd

Please sign in to comment.