diff options
| author | Lukas Larsson <lukas@erlang.org> | 2021-08-10 10:13:47 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang.org> | 2021-08-10 10:13:47 +0200 |
| commit | c96d35d356650d33e0dff53e70704157d19b66cf (patch) | |
| tree | fbad8c89782e2f45a38880380fa49b44ebfa0b53 /.github | |
| parent | 71b1113bfa9b5563d1e8a1c97223c917090e46df (diff) | |
| parent | 1875a286a241a79460f50fcaab7aa25a968cd7f5 (diff) | |
| download | erlang-c96d35d356650d33e0dff53e70704157d19b66cf.tar.gz | |
Merge branch 'maint'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/dockerfiles/Dockerfile.debian-base | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base index b6a8291e6f..094a79f20a 100644 --- a/.github/dockerfiles/Dockerfile.debian-base +++ b/.github/dockerfiles/Dockerfile.debian-base @@ -30,7 +30,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential & apt-get install -y build-essential m4 autoconf fop xsltproc default-jdk libxml2-utils \ $INSTALL_LIBS && \ if [ "$HOST_TRIP" != "$BUILD_TRIP" ]; then \ - apt-get install -y \ + apt-get install -y -f -o Dpkg::Options::="--force-overwrite" \ crossbuild-essential-$HOST_ARCH \ $(for LIB in $INSTALL_LIBS; do echo "$LIB:$HOST_ARCH"; done) && \ for dir in `find / -type d -name $HOST_TRIP`; do \ |