diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-06-02 11:18:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 11:18:30 +0000 |
| commit | a71fa22c4dca3ffda1137981d861a45e04db8925 (patch) | |
| tree | b6a6785e3583fe69bab5ffa17cd30459972306a8 | |
| parent | 0866a4fbc6e7f70cd3708467419c60af8c6104f2 (diff) | |
| parent | e009a46e2267a622eeef02217e273deb8913029f (diff) | |
| download | gcc-a71fa22c4dca3ffda1137981d861a45e04db8925.zip gcc-a71fa22c4dca3ffda1137981d861a45e04db8925.tar.gz gcc-a71fa22c4dca3ffda1137981d861a45e04db8925.tar.bz2 | |
Merge #1288
1288: docker: Add commit information to Docker image r=philberty a=CohenArthur
Closes #1262
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
| -rw-r--r-- | Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -44,7 +44,8 @@ RUN apt-get update; \ xz-utils \ zlib1g-dev \ flex \ - bison + bison \ + git ADD . /usr/src/gcc RUN /bin/sh -c set -ex; \ @@ -58,6 +59,9 @@ RUN /bin/sh -c set -ex; \ cd /root; \ rm -rf /usr/src/gcc +RUN cd /usr/src/gcc; \ + git log -1 --format="%h" > /GCCRS_BUILD; \ + RUN /bin/sh -c set -ex; \ echo '/usr/local/lib64' > /etc/ld.so.conf.d/local-lib64.conf; \ ldconfig -v @@ -69,6 +73,7 @@ RUN /bin/sh -c set -ex; \ FROM rust:latest COPY --from=gcc-builder /usr/ /usr/ +COPY --from=gcc-builder /GCCRS_BUILD /GCCRS_BUILD RUN cargo install --git https://github.com/Rust-GCC/cargo-gccrs cargo-gccrs CMD ["bash"] |