Skip to content

Commit 2dd6abb

Browse files
authored
bazel/sysroot: Use install stdlibc++ from gcc-13 (#2672)
Signed-off-by: Ryan Northey <[email protected]>
1 parent 810c64b commit 2dd6abb

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.github/workflows/sysroot.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,27 @@ jobs:
3030
runs-on: ubuntu-24.04-arm
3131
steps:
3232
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33-
- name: Install debootstrap
33+
- name: Install debootstrap/
3434
run: |
3535
sudo apt-get -qq update
3636
sudo apt-get -qq install -y debootstrap
37+
3738
- name: Build ${{ matrix.arch }} sysroot
3839
run: |
3940
sudo debootstrap \
4041
--arch=${{ matrix.arch }} \
4142
--variant=minbase \
42-
--include=libc6-dev,libstdc++-10-dev,linux-libc-dev,libtinfo5,libnuma-dev \
43+
--include=libc6,libc6-dev,linux-libc-dev,libtinfo5,libnuma-dev \
4344
bullseye \
4445
sysroot-${{ matrix.arch }} \
4546
http://deb.debian.org/debian/
47+
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main" \
48+
| sudo tee sysroot-${{ matrix.arch }}/etc/apt/sources.list.d/toolchain.list
49+
sudo apt-key --keyring sysroot-${{ matrix.arch }}/etc/apt/trusted.gpg adv \
50+
--keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
51+
sudo chroot sysroot-${{ matrix.arch }} apt-get update
52+
sudo chroot sysroot-${{ matrix.arch }} apt-get install -y libstdc++-13-dev
53+
4654
- name: Package sysroot
4755
run: |
4856
sudo tar -czf sysroot-${{ matrix.arch }}.tar.gz -C sysroot-${{ matrix.arch }} .

0 commit comments

Comments
 (0)