From accd6dd2287193c377c4bcef77e93a805413a9d0 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Sun, 5 Sep 2021 04:34:10 -0700 Subject: [PATCH] boost @1.76: set toolset for intel b2 invocation (#25722) and simplify constraint and add explanatory comment --- var/spack/repos/builtin/packages/boost/package.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index 1bf06b4f28a..9f25a195eae 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -446,7 +446,13 @@ def determine_b2_options(self, spec, options): '--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) ])