Skip to content

Commit

Permalink
fix: change cross container
Browse files Browse the repository at this point in the history
  • Loading branch information
banditopazzo committed Oct 26, 2022
1 parent 1dd339f commit 6afe9da
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 10 deletions.
6 changes: 6 additions & 0 deletions .cross/aarch64-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main
RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome > /etc/timezone && \
apt update && apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 15 && \
ln -s /usr/bin/clang-15 /usr/bin/clang && \
ln -s /usr/bin/llvm-strip-15 /usr/bin/llvm-strip
6 changes: 6 additions & 0 deletions .cross/aarch64-unknown-linux-musl.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl:main
RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome > /etc/timezone && \
apt update && apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 15 && \
ln -s /usr/bin/clang-15 /usr/bin/clang && \
ln -s /usr/bin/llvm-strip-15 /usr/bin/llvm-strip
6 changes: 6 additions & 0 deletions .cross/riscv64gc-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:main
RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome > /etc/timezone && \
apt update && apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 15 && \
ln -s /usr/bin/clang-15 /usr/bin/clang && \
ln -s /usr/bin/llvm-strip-15 /usr/bin/llvm-strip
6 changes: 6 additions & 0 deletions .cross/x86_64-unknown-linux-gnu.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main
RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome > /etc/timezone && \
apt update && apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 15 && \
ln -s /usr/bin/clang-15 /usr/bin/clang && \
ln -s /usr/bin/llvm-strip-15 /usr/bin/llvm-strip
6 changes: 6 additions & 0 deletions .cross/x86_64-unknown-linux-musl.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ghcr.io/cross-rs/x86_64-unknown-linux-musl:main
RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && echo Europe/Rome > /etc/timezone && \
apt update && apt install -y lsb-release wget software-properties-common gnupg && \
wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh 15 && \
ln -s /usr/bin/clang-15 /usr/bin/clang && \
ln -s /usr/bin/llvm-strip-15 /usr/bin/llvm-strip
15 changes: 5 additions & 10 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
[target.aarch64-unknown-linux-gnu]
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main"
pre-build = ["apt install -y clang llvm"]
dockerfile = ".cross/aarch64-unknown-linux-gnu.Dockerfile"

[target.aarch64-unknown-linux-musl]
image = "ghcr.io/cross-rs/aarch64-unknown-linux-musl:main"
pre-build = ["apt install -y clang llvm"]
dockerfile = ".cross/aarch64-unknown-linux-musl.Dockerfile"

[target.riscv64gc-unknown-linux-gnu]
image = "ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:main"
pre-build = ["apt install -y clang llvm"]
dockerfile = ".cross/riscv64gc-unknown-linux-gnu.Dockerfile"

[target.x86_64-unknown-linux-gnu]
image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main"
pre-build = ["apt install -y clang llvm"]
dockerfile = ".cross/x86_64-unknown-linux-gnu.Dockerfile"

[target.x86_64-unknown-linux-musl]
image = "ghcr.io/cross-rs/x86_64-unknown-linux-musl:main"
pre-build = ["apt install -y clang llvm"]
dockerfile = ".cross/x86_64-unknown-linux-musl.Dockerfile"

0 comments on commit 6afe9da

Please sign in to comment.