Skip to content
Snippets Groups Projects

Apply distro CXXFLAGS when boostrapping b2 (LP: #2073861)

Open Simon Chopin requested to merge schopin/boost:b2-buildflags into master
2 files
+ 45
0
Compare changes
  • Side-by-side
  • Inline
Files
2
From 491d332bd8c9c7d241da90077298839f8f8f0f8d Mon Sep 17 00:00:00 2001
From: Simon Chopin <simon.chopin@canonical.com>
Date: Tue, 23 Jul 2024 10:01:36 +0200
Subject: [PATCH] Don't clear CXXFLAGS when bootstrapping b2
We want it to obey the distro flags, too!
Forwarded: not-needed, this is purely on the distro side
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/boost1.83/+bug/2073861
---
bootstrap.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -35,6 +35,8 @@
flag_icu=
flag_show_libraries=
+set -x
+
for option
do
case $option in
@@ -226,7 +228,7 @@
if test "x$BJAM" = x; then
$ECHO "Building B2 engine.."
pwd=`pwd`
- CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" ${TOOLSET}
+ CXX= CXXFLAGS= "$my_dir/tools/build/src/engine/build.sh" --cxxflags="${CXXFLAGS}" ${TOOLSET}
if [ $? -ne 0 ]; then
echo
echo "Failed to build B2 build engine"
--- a/tools/build/src/engine/build.sh
+++ b/tools/build/src/engine/build.sh
@@ -5,6 +5,8 @@
#~ (See accompanying file LICENSE_1_0.txt or copy at
#~ http://www.boost.org/LICENSE_1_0.txt)
+set -x
+
FALSE=1
TRUE=0
Loading