From d8c437364462c328fc90d6ecce407441dc56aadb Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Thu, 24 Nov 2022 18:47:25 +0000 Subject: [PATCH 1/2] Downgrade back to `clang-14` as using `clang-15` doesn't fix anything --- dockerfiles/base-ci-linux/Dockerfile | 14 +++++++------- dockerfiles/base-ci-linux/README.md | 6 +++--- dockerfiles/utility/base-ci-linux-config | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dockerfiles/base-ci-linux/Dockerfile b/dockerfiles/base-ci-linux/Dockerfile index ccceb16a..108c3c9e 100644 --- a/dockerfiles/base-ci-linux/Dockerfile +++ b/dockerfiles/base-ci-linux/Dockerfile @@ -31,8 +31,8 @@ COPY utility/base-ci-linux-config /root/.cargo/config ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - CC=clang-15 \ - CXX=clang-15 + CC=clang-14 \ + CXX=clang-14 # install tools and dependencies RUN set -eux; \ @@ -41,13 +41,13 @@ RUN set -eux; \ libssl-dev make cmake graphviz \ git pkg-config curl time rhash ca-certificates \ python3 python3-pip lsof ruby ruby-bundler git-restore-mtime xz-utils unzip gnupg protobuf-compiler && \ -# add clang 15 repo +# add clang 14 repo curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -; \ - echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-15 main" >> /etc/apt/sources.list.d/llvm-toochain-buster-15.list; \ - echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-15 main" >> /etc/apt/sources.list.d/llvm-toochain-buster-15.list; \ + echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-14 main" >> /etc/apt/sources.list.d/llvm-toochain-buster-14.list; \ + echo "deb-src http://apt.llvm.org/buster/ llvm-toolchain-buster-14 main" >> /etc/apt/sources.list.d/llvm-toochain-buster-14.list; \ apt-get -y update; \ apt-get install -y --no-install-recommends \ - clang-15 lldb-15 lld-15 libclang-15-dev && \ + clang-14 lldb-14 lld-14 libclang-14-dev && \ # add non-root user groupadd -g 1000 nonroot && \ useradd -u 1000 -g 1000 -s /bin/bash -m nonroot && \ @@ -61,7 +61,7 @@ RUN set -eux; \ curl -L "https://dl.min.io/client/mc/release/linux-amd64/mc" -o /usr/local/bin/mc && \ chmod 755 /usr/local/bin/mc && \ # set a link to clang - update-alternatives --install /usr/bin/cc cc /usr/bin/clang-15 100; \ + update-alternatives --install /usr/bin/cc cc /usr/bin/clang-14 100; \ # install rustup, use minimum components curl -L "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \ -o rustup-init; \ diff --git a/dockerfiles/base-ci-linux/README.md b/dockerfiles/base-ci-linux/README.md index e670c854..0c6e656f 100644 --- a/dockerfiles/base-ci-linux/README.md +++ b/dockerfiles/base-ci-linux/README.md @@ -11,9 +11,9 @@ Used to build and test Substrate-based projects. **Dependencies and Tools:** - `libssl-dev` -- `clang-15` -- `lld-15` -- `libclang-15-dev` +- `clang-14` +- `lld-14` +- `libclang-14-dev` - `make` - `cmake` - `git` diff --git a/dockerfiles/utility/base-ci-linux-config b/dockerfiles/utility/base-ci-linux-config index efe8fc8b..5b4bf1af 100644 --- a/dockerfiles/utility/base-ci-linux-config +++ b/dockerfiles/utility/base-ci-linux-config @@ -1,9 +1,9 @@ [target.wasm32-unknown-unknown] runner = "node" -linker="clang-15" +linker="clang-14" [target.x86_64-unknown-linux-gnu] # Enables the aes-ni instructions for RustCrypto dependency. rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"] # setup clang as Linker -linker="clang-15" +linker="clang-14" From 7e4e92deba36d7d1dcd2c313effd7848feee1576 Mon Sep 17 00:00:00 2001 From: Vladimir Istyufeev Date: Thu, 24 Nov 2022 18:48:43 +0000 Subject: [PATCH 2/2] Use LLVM's lld instead of GNU's ld --- dockerfiles/base-ci-linux/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dockerfiles/base-ci-linux/Dockerfile b/dockerfiles/base-ci-linux/Dockerfile index 108c3c9e..4de2a437 100644 --- a/dockerfiles/base-ci-linux/Dockerfile +++ b/dockerfiles/base-ci-linux/Dockerfile @@ -62,6 +62,8 @@ RUN set -eux; \ chmod 755 /usr/local/bin/mc && \ # set a link to clang update-alternatives --install /usr/bin/cc cc /usr/bin/clang-14 100; \ +# set a link to ldd + update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-14 100; \ # install rustup, use minimum components curl -L "https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init" \ -o rustup-init; \