From 97c679fe810403a6019fcf15e0d89de832054580 Mon Sep 17 00:00:00 2001 From: Brad Campbell Date: Wed, 22 Nov 2023 11:39:43 -0500 Subject: [PATCH] try gcc 10.5.0 --- Configuration.mk | 2 +- libc++/Dockerfile | 2 +- libc++/Makefile | 2 +- libc++/README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Configuration.mk b/Configuration.mk index 618302001..b6e2bfcdc 100644 --- a/Configuration.mk +++ b/Configuration.mk @@ -29,7 +29,7 @@ SIZE := -size # Library versions. NEWLIB_VERSION ?= 4.2.0.20211231 -LIBCPP_VERSION ?= 12.3.0 +LIBCPP_VERSION ?= 10.5.0 # Set default region sizes for process memory requirements. STACK_SIZE ?= 2048 diff --git a/libc++/Dockerfile b/libc++/Dockerfile index 81ed8ea42..d9b55e0a4 100644 --- a/libc++/Dockerfile +++ b/libc++/Dockerfile @@ -21,7 +21,7 @@ RUN apt install -y libmpc-dev file # Clone the libtock-c source so we can use the build scripts RUN git clone https://github.com/tock/libtock-c --depth 1 -b make-precompiled -RUN cd libtock-c && git fetch && git checkout 0fed22764837d9d4cfe44e59477f8e68f1a544c7 +RUN cd libtock-c && git fetch && git checkout f21df388a5284dce3f1425e4120930f6d9e57396 # Actually build the toolchain RUN cd libtock-c/libc++ && make diff --git a/libc++/Makefile b/libc++/Makefile index 6fb356b90..68157a004 100644 --- a/libc++/Makefile +++ b/libc++/Makefile @@ -1,4 +1,4 @@ -GCC_VERSION ?= 12.3.0 +GCC_VERSION ?= 10.5.0 NEWLIB_VERSION ?= 4.2.0.20211231 all: rebuild-gcc diff --git a/libc++/README.md b/libc++/README.md index 34623e318..cb4a1d5ea 100644 --- a/libc++/README.md +++ b/libc++/README.md @@ -25,9 +25,9 @@ To help ensure reproducibility, we also include a Dockerfile which can be used to create the libc++ libraries. ```bash -LIBCPP=12.3.0 +LIBCPP=10.5.0 cd libtock-c/libc++ -docker build -t libtock-c-libcpp . -id=$(docker create libtock-c-libcpp) +docker build -t libtock-c-libcpp-$LIBCPP . +id=$(docker create libtock-c-libcpp-$LIBCPP) docker cp $id:/libtock-c/libc++/libtock-libc++-$LIBCPP.zip libtock-libc++-$LIBCPP.zip ```