Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Resolve add linux as cross-compilation platform #42

Closed
wants to merge 4 commits into from
Closed
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
6 changes: 1 addition & 5 deletions docker/Dockerfile.x86_64-pc-windows-gnu
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
FROM rustembedded/cross:x86_64-pc-windows-gnu
FROM docker.io/rustembedded/cross:x86_64-pc-windows-gnu

RUN dpkg --add-architecture i386 && apt-get update && \
apt-get install --assume-yes --no-install-recommends \
wine-stable \
wine64 \
wine32 \
libz-mingw-w64-dev \
llvm-dev \
libclang-dev \
clang
11 changes: 7 additions & 4 deletions docker/Dockerfile.x86_64-unknown-linux-gnu
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM rustembedded/cross:x86_64-unknown-linux-gnu
FROM docker.io/rustembedded/cross:x86_64-unknown-linux-gnu

RUN yum update -y && \
yum install centos-release-scl -y && \
yum install llvm-toolset-7 -y && \
yum install scl-utils -y && \
echo "source scl_source enable llvm-toolset-7" >> ~/.bash_profile
yum install llvm-toolset-7 -y

COPY docker/scl_enable /usr/bin/scl_enable
ENV BASH_ENV="/usr/bin/scl_enable" \
ENV="/usr/bin/scl_enable" \
PROMPT_COMMAND=". /usr/bin/scl_enable"
2 changes: 2 additions & 0 deletions docker/scl_enable
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
unset BASH_ENV PROMPT_COMMAND ENV
source scl_source enable llvm-toolset-7