boost: Patch B2 bootstrap step to use correct toolchain (#21408)

This commit is contained in:
Sebastian Mobo 2021-02-26 18:46:37 -05:00 committed by GitHub
parent f2f58b70b1
commit 4f84721dc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- a/bootstrap.sh 2020-12-03 00:00:59.000000000 -0500
+++ a/bootstrap.sh 2021-01-08 13:38:30.000000000 -0500
@@ -223,7 +223,7 @@
if test "x$BJAM" = x; then
$ECHO "Building B2 engine.."
pwd=`pwd`
- (cd "$my_dir/tools/build/src/engine" && ./build.sh)
+ (cd "$my_dir/tools/build/src/engine" && ./build.sh "$TOOLSET")
if [ $? -ne 0 ]; then
echo
echo "Failed to build B2 build engine"

View File

@ -260,6 +260,11 @@ def libs(self):
# See https://github.com/boostorg/python/pull/218
patch('boost_218.patch', when='@1.63.0:1.67.99')
# Fix B2 bootstrap toolset during installation
# See https://github.com/spack/spack/issues/20757
# and https://github.com/spack/spack/pull/21408
patch("bootstrap-toolset.patch", when="@1.75:")
def patch(self):
# Disable SSSE3 and AVX2 when using the NVIDIA compiler
if self.spec.satisfies('%nvhpc'):