Skip to content

bazel/sysroot: Remove incorrect condition for libstdc++ #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 1 commit into from
Jan 4, 2026
Merged

bazel/sysroot: Remove incorrect condition for libstdc++ #3382

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions bazel/sysroot/build_sysroot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,17 @@ install_base_packages () {
}

install_libstdcc () {
if [[ "$VARIANT" == "libstdcxx" ]]; then
echo ""
if [[ "$CROSS_COMPILE" == "true" ]]; then
echo "Step 4: Skipping libstdc++ installation (cross-compile mode)"
else
echo "Step 4: Installing libstdc++..."
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $PPA_TOOLCHAIN main" \
| sudo tee "$WORK_DIR/etc/apt/sources.list.d/toolchain.list" > /dev/null
retry 3 10 sudo apt-key --keyring "$WORK_DIR/etc/apt/trusted.gpg" adv \
--keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
retry 3 10 sudo chroot "$WORK_DIR" apt-get -qq update
retry 3 10 sudo chroot "$WORK_DIR" apt-get -qq install -y "libstdc++-${STDCC_VERSION}-dev"
fi
if [[ "$VARIANT" != "libstdcxx" ]]; then
return
fi
echo ""
echo "Step 4: Installing libstdc++..."
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $PPA_TOOLCHAIN main" \
| sudo tee "$WORK_DIR/etc/apt/sources.list.d/toolchain.list" > /dev/null
retry 3 10 sudo apt-key --keyring "$WORK_DIR/etc/apt/trusted.gpg" adv \
--keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
retry 3 10 sudo chroot "$WORK_DIR" apt-get -qq update
retry 3 10 sudo chroot "$WORK_DIR" apt-get -qq install -y "libstdc++-${STDCC_VERSION}-dev"
}

cleanup_sysroot () {
Expand Down
Loading