env: add g++-multilib for running swig tests on 386

For #67698.

Change-Id: I9da96e53aecd86f5b881578c3a5f0517205eace4
Reviewed-on: https://go-review.googlesource.com/c/build/+/589175
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Auto-Submit: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
Michael Anthony Knyszek 2024-05-29 19:53:02 +00:00 коммит произвёл Gopher Robot
Родитель 68ac94bf7f
Коммит 30d17922cc
2 изменённых файлов: 6 добавлений и 2 удалений

4
env/linux-x86-bookworm/Dockerfile поставляемый
Просмотреть файл

@ -41,7 +41,8 @@ ENV DEBIAN_FRONTEND noninteractive
# gdb: optionally used by runtime tests for gdb
# gfortran: for compiling cgo with fortran support (multilib for 386)
# git: git VCS supported by cmd/go
# g++: used for building some benchmarks
# g++: used for swig tests and building some benchmarks
# g++-multilib: used for 32-bit swig tests
# less: misc basic tool
# libc6-dev-i386: for 32-bit builds
# libc6-dev: for building Go's bootstrap 'dist' prog
@ -73,6 +74,7 @@ RUN apt-get update && apt-get install -y \
gfortran-multilib \
git \
g++ \
g++-multilib \
iptables \
iproute2 \
less \

4
env/linux-x86-bullseye/Dockerfile поставляемый
Просмотреть файл

@ -17,7 +17,8 @@ ENV DEBIAN_FRONTEND noninteractive
# gdb: optionally used by runtime tests for gdb
# gfortran: for compiling cgo with fortran support (multilib for 386)
# git: git VCS supported by cmd/go
# g++: used for building some benchmarks
# g++: used for swig tests and building some benchmarks
# g++-multilib: used for 32-bit swig tests
# libc6-dev-i386: for 32-bit builds
# libc6-dev: for building Go's bootstrap 'dist' prog
# libgles2-mesa-dev: required by x/mobile repo
@ -48,6 +49,7 @@ RUN apt-get update && apt-get install -y \
gfortran-multilib \
git \
g++ \
g++-multilib \
iptables \
iproute2 \
libc6-dev \