diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2022-06-08 10:57:16 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2022-06-08 10:57:16 +0200 |
| commit | ab0f9f9e1b9e55522e649d58520fdedcdb6c8859 (patch) | |
| tree | 73e88496eadc25d0a63ced00edc5e578fc20ef39 | |
| parent | 9d81164aa0447c738fe0435de14ec9666a03d5da (diff) | |
| download | gcc-ab0f9f9e1b9e55522e649d58520fdedcdb6c8859.zip gcc-ab0f9f9e1b9e55522e649d58520fdedcdb6c8859.tar.gz gcc-ab0f9f9e1b9e55522e649d58520fdedcdb6c8859.tar.bz2 | |
docker: Fix GCCRS_BUILD info
Sometimes, the GCCRS_BUILD file would end up empty. I believe this is
due to how Dockerfiles work in that there was a "race condition" between
the two `RUN` commands. Hopefully this should fix it.
| -rw-r--r-- | Dockerfile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -50,6 +50,7 @@ RUN apt-get update; \ ADD . /usr/src/gcc RUN /bin/sh -c set -ex; \ cd /usr/src/gcc; \ + git log -1 --format="%h" > /GCCRS_BUILD; \ ./contrib/download_prerequisites; { rm *.tar.* || true; }; \ mkdir -p /usr/src/gcc/gcc-build; \ cd /usr/src/gcc/gcc-build; \ @@ -59,9 +60,6 @@ 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 |