summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Forrington <nick.forrington@arm.com>2019-07-11 22:53:54 -0400
committerAdam J. Stewart <ajstewart426@gmail.com>2019-07-11 21:53:54 -0500
commitff728bd06cb23245e3e9d848647938bfdef70a52 (patch)
tree72ee218c71f3afb7ea31c184df451bcb07422ab8
parent0dfa5a467c188c040fcc70bc75a5f69da3a2cbd4 (diff)
downloadspack-ff728bd06cb23245e3e9d848647938bfdef70a52.tar.gz
spack-ff728bd06cb23245e3e9d848647938bfdef70a52.tar.bz2
spack-ff728bd06cb23245e3e9d848647938bfdef70a52.tar.xz
spack-ff728bd06cb23245e3e9d848647938bfdef70a52.zip
Boost: Compile with toolset=clang for Arm compiler (#11992)
Bootstraps with gcc, but compiles with clang
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index d646967da0..865f7090c4 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -201,6 +201,7 @@ class Boost(Package):
toolsets = {'g++': 'gcc',
'icpc': 'intel',
'clang++': 'clang',
+ 'armclang++': 'clang',
'xlc++': 'xlcpp',
'xlc++_r': 'xlcpp',
'pgc++': 'pgi'}
@@ -228,7 +229,12 @@ class Boost(Package):
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: