Skip to content

Commit e66870f

Browse files
committed
Switch to GCC 13 for linux
1 parent 01ae93f commit e66870f

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.containerversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
46
1+
47

CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,6 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG")
333333
endif()
334334
endif()
335335

336-
# Disallow duplicate definitions, which is the default since GCC
337-
# 10. It was not default in gcc-arm-none-eabi-8-2018-q4.
338-
string(APPEND CMAKE_C_FLAGS " -fno-common")
339-
340336
# For `struct timespec` and `strdup`
341337
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
342338

Dockerfile

+7-9
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,15 @@ RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/a
3535
# Install gcc8-arm-none-eabi
3636
RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
3737
GNU_TOOLCHAIN=https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz \
38-
GNU_TOOLCHAIN_HASH=c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764 \
39-
GNU_TOOLCHAIN_FORMAT=xz; \
38+
GNU_TOOLCHAIN_HASH=c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764; \
4039
else \
41-
GNU_TOOLCHAIN=https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2018q4/gcc-arm-none-eabi-8-2018-q4-major-linux.tar.bz2 \
42-
GNU_TOOLCHAIN_HASH=fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52 \
43-
GNU_TOOLCHAIN_FORMAT=bz2; \
40+
GNU_TOOLCHAIN=https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz \
41+
GNU_TOOLCHAIN_HASH=95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4; \
4442
fi; \
45-
wget -O gcc.tar.${GNU_TOOLCHAIN_FORMAT} ${GNU_TOOLCHAIN} &&\
46-
echo "$GNU_TOOLCHAIN_HASH gcc.tar.${GNU_TOOLCHAIN_FORMAT}" | sha256sum -c &&\
47-
tar -xvf gcc.tar.${GNU_TOOLCHAIN_FORMAT} -C /usr/local --strip-components=1 &&\
48-
rm -f gcc.tar.${GNU_TOOLCHAIN_FORMAT}
43+
curl -sSL -o gcc.tar.xz ${GNU_TOOLCHAIN} && \
44+
echo "$GNU_TOOLCHAIN_HASH gcc.tar.xz" | sha256sum -c && \
45+
tar -xvf gcc.tar.xz -C /usr/local --strip-components=1 && \
46+
rm -f gcc.tar.xz
4947

5048
# Tools for building
5149
RUN apt-get update && apt-get install -y \

0 commit comments

Comments
 (0)