diff options
| author | Dave Airlie <[email protected]> | 2020-02-14 15:47:20 +1000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-02-15 04:15:00 +0000 |
| commit | 8f5a252d350cb1abcad13f7d637548a8e0e7da33 (patch) | |
| tree | b64a660785b354d602888d310f4a1b28bbf81cff /.gitlab-ci | |
| parent | e7375e17958993b90d9f01d76dbc7eacdbf8c195 (diff) | |
ci: bump debian image and change llvm deps to 8
v3: remove version in a few places (Michel)
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3805>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3805>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 7fcb32ef328..9170c84c7a9 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -76,6 +76,7 @@ apt-get install -y --no-remove \ libxvmc-dev \ libxxf86vm-dev \ llvm-6.0-dev \ + llvm-7-dev \ llvm-9-dev \ meson \ pkg-config \ @@ -97,29 +98,22 @@ for arch in $CROSS_ARCHITECTURES; do libelf-dev:${arch} \ libexpat1-dev:${arch} - if [ "$arch" = "s390x" ]; then - LLVM_VERSION=7 - else - LLVM_VERSION=8 - fi - if [ "$arch" != "i386" ]; then mkdir /var/cache/apt/archives/${arch} apt-get install -y --no-remove \ libffi-dev:${arch} \ - libllvm${LLVM_VERSION}:${arch} \ + libllvm8:${arch} \ libstdc++6:${arch} \ libtinfo-dev:${arch} \ # Download llvm-* packages, but don't install them yet, since they can # only be installed for one architecture at a time apt-get install -o Dir::Cache::archives=/var/cache/apt/archives/$arch --download-only -y --no-remove \ - llvm-${LLVM_VERSION}-dev:${arch} + llvm-8-dev:${arch} fi done apt-get install -y --no-remove \ - llvm-7-dev \ llvm-8-dev \ # for 64bit windows cross-builds |