diff options
| author | Peter Scheibel <scheibel1@llnl.gov> | 2021-09-05 04:34:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-05 13:34:10 +0200 |
| commit | accd6dd2287193c377c4bcef77e93a805413a9d0 (patch) | |
| tree | 4c58742ddd17f236cbfc9e857024d25d634d30b1 /var | |
| parent | 0ad54e0679b1189f5a5d8aa288dd2673d3dd4ab3 (diff) | |
| download | spack-accd6dd2287193c377c4bcef77e93a805413a9d0.tar.gz spack-accd6dd2287193c377c4bcef77e93a805413a9d0.tar.bz2 spack-accd6dd2287193c377c4bcef77e93a805413a9d0.tar.xz spack-accd6dd2287193c377c4bcef77e93a805413a9d0.zip | |
boost @1.76: set toolset for intel b2 invocation (#25722)
and simplify constraint and add explanatory comment
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/boost/package.py | 8 |
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 1bf06b4f28..9f25a195ea 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -446,7 +446,13 @@ class Boost(Package): '--layout=%s' % layout ]) - if not spec.satisfies('%intel'): + if not spec.satisfies('@:1.75 %intel'): + # When building any version >= 1.76, the toolset must be specified. + # Earlier versions could not specify Intel as the toolset + # as that was considered to be redundant/conflicting with + # --with-toolset in bootstrap. + # (although it is not currently known if 1.76 is the earliest + # version that requires specifying the toolset for Intel) options.extend([ 'toolset=%s' % self.determine_toolset(spec) ]) |