diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-08 12:33:55 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-08 12:38:42 +0000 |
commit | 34f5ee8969b07c76b0d838e2f62bb4c1ef105504 (patch) | |
tree | 398ccd8b1244f572681e7037f4201746a09195ca /xenial-armhf-tcwg-base | |
parent | 2fe762fb228e37a6906b7026164af97dabc0b81f (diff) |
tcwg-llvmbot: Improve handling of bare-metal bots in run.sh.tmpl
Change-Id: Ie60ece7017af20c750c65e6c8bdb757cfdf79b86
Diffstat (limited to 'xenial-armhf-tcwg-base')
-rw-r--r-- | xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile index 078e7669..5245df2a 100644 --- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile +++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/Dockerfile @@ -30,6 +30,16 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \ && cd .. \ && rm -rf ninja +# Add current clang for benefit of libcxx bots. LLD bot requires +# ld.lld symlink, which clang release happens to provide, but will work with +# symlinking ld.lld from ld.bfd just as well. +RUN \ + clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf \ + && cd /usr/local \ + && wget http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \ + && tar -x --strip-components=1 -f $clang_ver.tar.xz \ + && rm $clang_ver.tar.xz + VOLUME /home COPY run.sh . @@ -37,4 +47,4 @@ COPY start.sh . ENTRYPOINT ["linux32", "/run.sh"] CMD ["start.sh"] -# checksum: 363894f7aa7d736e3e88da5ed9b55b0f +# checksum: 000f6c3ec143b2a7d51a8ae645dbc466 |