Fixed boost toolset detection

spack · Aug 2, 2016 · 986b28f · 986b28f
1 parent c678a9e
commit 986b28f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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: