Skip to content

Commit eaa7090

Browse files
committed
🐛 gcc-multilib only available for amd64
1 parent b517bca commit eaa7090

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

build/plugins/docker/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ RUN set -ex \
4747
build-essential \
4848
coreutils \
4949
gcc \
50-
gcc-multilib \
5150
gcovr \
5251
gdb \
5352
git-all \
@@ -119,6 +118,15 @@ RUN set -ex \
119118
&& bundle install --gemfile=/assets/base/gems/Gemfile \
120119
&& rm .gemrc
121120

121+
# gcc-multilib for processor architectures is only available for AMD64 image builds
122+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then set -ex \
123+
&& apt update \
124+
&& apt install -y \
125+
gcc-multilib \
126+
--no-install-recommends \
127+
&& apt clean \
128+
&& rm -rf /var/lib/apt/lists/* ; fi
129+
122130
# Microsoft Dotnet installation to support `reportgenerator` for `gcov` plugin
123131
# Only available on AMD64 image builds
124132
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then set -ex \

build/standard/Dockerfile-build

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
# gcc-multilib for processor architectures is only available for AMD64 image builds
3+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then set -ex \
4+
&& apt update \
5+
&& apt install -y \
6+
gcc-multilib \
7+
--no-install-recommends \
8+
&& apt clean \
9+
&& rm -rf /var/lib/apt/lists/* ; fi

build/standard/docker/Dockerfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ RUN set -ex \
4747
build-essential \
4848
coreutils \
4949
gcc \
50-
gcc-multilib \
5150
gdb \
5251
libc-dev \
5352
locales \
@@ -103,6 +102,15 @@ RUN set -ex \
103102
&& bundle install --gemfile=/assets/base/gems/Gemfile \
104103
&& rm .gemrc
105104

105+
# gcc-multilib for processor architectures is only available for AMD64 image builds
106+
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then set -ex \
107+
&& apt update \
108+
&& apt install -y \
109+
gcc-multilib \
110+
--no-install-recommends \
111+
&& apt clean \
112+
&& rm -rf /var/lib/apt/lists/* ; fi
113+
106114

107115
##
108116
## Permissions Security & Cleanup

build/standard/packages.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

22
- gcc # GNU Compiler Collection
33
- libc-dev # Common C development packages
4-
- gcc-multilib # Processor architectures
54
- gdb # Debugger (for Ceedling `backtrace` feature)

0 commit comments

Comments
 (0)