Skip to content

Simplify c2rust #196

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.

Sign up for GitHub

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

Closed
chrysn wants to merge 5 commits into from
Closed

Simplify c2rust #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e62481
c2rust: Install via riotbuild
chrysn May 13, 2022
792353c
c2rust: Update version
chrysn May 13, 2022
d084ef0
export CARGO_HOME environment variable
chrysn May 13, 2022
8b06c23
Revert "export CARGO_HOME environment variable"
chrysn May 14, 2022
529f6d4
fixup! c2rust: Install via riotbuild
chrysn May 14, 2022
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
95 changes: 0 additions & 95 deletions c2rust-built/Dockerfile
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions c2rust-built/README.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions c2rust-built/debian/changelog
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions c2rust-built/debian/control
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions c2rust-built/debian/rules
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions riotbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ RUN mkdir /pkgs
COPY files/libsocketcan-dev_0.0.11-1_i386.deb /pkgs/libsocketcan-dev_0.0.11-1_i386.deb
COPY files/libsocketcan2_0.0.11-1_i386.deb /pkgs/libsocketcan2_0.0.11-1_i386.deb

COPY --from=chrysn/c2rust-built:for-riot /c2rust.deb /pkgs

# The following package groups will be installed:
# - update the package index files to latest available version
# - native platform development and build system functionality (about 400 MB installed)
Expand Down Expand Up @@ -107,6 +105,11 @@ RUN \
llvm \
clang \
clang-tools \
&& echo 'Installing C2Rust (build) dependencies' >&2 && \
apt-get -y --no-install-recommends install \
libclang-dev \
libssl-dev \
llvm-dev \
&& \
SYMS=$(find /usr/bin -type l) && \
for file in ${SYMS}; do \
Expand Down Expand Up @@ -309,6 +312,12 @@ RUN \
true; \
done"

RUN \
echo 'Installing C2Rust' >&2 && \
CARGO_HOME=/opt/rustup/.cargo cargo install --no-track --locked c2rust --git https://github.com/chrysn-pull-requests/c2rust --branch for-riot-20220513b && \
echo 'Cleaning up root-owned crates.io cache' >&2 && \
rm -rf /opt/rustup/.cargo/{git,registry,.package-cache}

# get Dockerfile version from build args
ARG RIOTBUILD_VERSION=unknown
ENV RIOTBUILD_VERSION $RIOTBUILD_VERSION
Expand Down