Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use llvm 19 in cross containers #324

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .cross/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ These containers are used in conjunction with [cross](https://github.com/cross-r

Containers are based on the default [cross containers](https://github.com/orgs/cross-rs/packages) built from `Ubuntu 20.04 LTS`, with the addition of:

- `Clang/LLVM 16`
- `Clang/LLVM 19`
- `libssl-dev` speficic for the target architecture, example `libssl-dev:arm64`
- `libsqlite3-dev` speficic for the target architecture, example `libsqlite3-dev:arm64`
6 changes: 3 additions & 3 deletions .cross/aarch64-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ RUN dpkg --add-architecture arm64 && \
gnupg \
libssl-dev:arm64 \
libsqlite3-dev:arm64 \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 \
&& ln -s /usr/bin/clang-17 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-17 /usr/bin/llvm-strip
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 19 \
&& ln -s /usr/bin/clang-19 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-19 /usr/bin/llvm-strip
6 changes: 3 additions & 3 deletions .cross/aarch64-unknown-linux-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ RUN dpkg --add-architecture arm64 && \
wget \
software-properties-common \
gnupg \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 \
&& ln -s /usr/bin/clang-17 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-17 /usr/bin/llvm-strip
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 19 \
&& ln -s /usr/bin/clang-19 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-19 /usr/bin/llvm-strip
6 changes: 3 additions & 3 deletions .cross/riscv64gc-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ RUN dpkg --add-architecture riscv64 && \
gnupg \
libssl-dev:riscv64 \
libsqlite3-dev:riscv64 \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 \
&& ln -s /usr/bin/clang-17 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-17 /usr/bin/llvm-strip
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 19 \
&& ln -s /usr/bin/clang-19 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-19 /usr/bin/llvm-strip
6 changes: 3 additions & 3 deletions .cross/x86_64-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome >
gnupg \
libssl-dev \
libsqlite3-dev \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 \
&& ln -s /usr/bin/clang-17 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-17 /usr/bin/llvm-strip
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 19 \
&& ln -s /usr/bin/clang-19 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-19 /usr/bin/llvm-strip
6 changes: 3 additions & 3 deletions .cross/x86_64-unknown-linux-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome >
wget \
software-properties-common \
gnupg \
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 17 \
&& ln -s /usr/bin/clang-17 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-17 /usr/bin/llvm-strip
&& wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 19 \
&& ln -s /usr/bin/clang-19 /usr/bin/clang \
&& ln -s /usr/bin/llvm-strip-19 /usr/bin/llvm-strip
Loading