diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-15 15:47:25 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-02-15 15:49:03 +0000 |
| commit | d84174480eb91a404791c8080d32be4e4fdc1f46 (patch) | |
| tree | 11b0f4ff26a6a1e6037bc9d567df04664282e049 /xenial-arm64-tcwg-base | |
| parent | 5d4b5ca3097881d6e61179ea27d50ca685c37523 (diff) | |
tcwg-llvmbot: Use custom clang 5.0.1 only for libcxx bots
... and use system's clang 3.8 for all other bots.
Change-Id: I427f8ce9d44e8d2322025734f37271fc0745ee56
Diffstat (limited to 'xenial-arm64-tcwg-base')
| -rw-r--r-- | xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile index b81c46f8..a5327736 100644 --- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile +++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/Dockerfile @@ -30,14 +30,12 @@ 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. +# Add current clang for libcxx bots. RUN \ clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \ && 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 \ + && wget --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \ + && tar xf $clang_ver.tar.xz \ && rm $clang_ver.tar.xz VOLUME /home @@ -47,4 +45,4 @@ COPY start.sh . ENTRYPOINT ["/run.sh"] CMD ["start.sh"] -# checksum: f2302dfb612463c026cb8b58b84e2425 +# checksum: e518582a2a434e66d9c9388c0bd2fa91 |