boost @1.76: set toolset for intel b2 invocation (#25722)

and simplify constraint and add explanatory comment
This commit is contained in:
Peter Scheibel 2021-09-05 04:34:10 -07:00 committed by GitHub
parent 0ad54e0679
commit accd6dd228
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -446,7 +446,13 @@ def determine_b2_options(self, spec, options):
'--layout=%s' % layout '--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([ options.extend([
'toolset=%s' % self.determine_toolset(spec) 'toolset=%s' % self.determine_toolset(spec)
]) ])