From 986b28f1f7f7204829dc5384837a1efff27fe54d Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33@llnl.gov>
Date: Mon, 1 Aug 2016 17:04:32 -0700
Subject: [PATCH] Fixed boost toolset detection
---
var/spack/repos/builtin/packages/boost/package.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 67294fb9a1..3dc6af42ba 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -133,11 +133,15 @@ def url_for_version(self, version):
def determine_toolset(self, spec):
if spec.satisfies("platform=darwin"):
- return 'darwin'
+ if 'icpc' in self.compiler.cxx_names:
+ return 'intel-darwin'
+ else:
+ return 'darwin'
toolsets = {'g++': 'gcc',
- 'icpc': 'intel',
- 'clang++': 'clang'}
+ 'icpc': 'intel-linux',
+ 'clang++': 'clang',
+ 'pgi++': 'pgi'}
for cc, toolset in toolsets.iteritems():
if cc in self.compiler.cxx_names:
--
GitLab