Mesa (master): gitlab-ci: build GLVND in meson-clang

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 7362176cfe47bc372caca1e90c85bb8758f42687
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7362176cfe47bc372caca1e90c85bb8758f42687

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Nov 19 14:37:32 2019 +0100

gitlab-ci: build GLVND in meson-clang

Building GLVND in meson-main doesn't work because this disables
libEGL and it's needed for running shader-db.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>

---

 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f742d430b9..9c0612a90b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -318,7 +318,6 @@ meson-swr-glvnd:
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
-      -D glvnd=true
       -D egl=true
     GALLIUM_ST: >
       -D dri3=true
@@ -336,6 +335,8 @@ meson-clang:
   extends: .meson-build
   variables:
     UNWIND: "true"
+    DRI_LOADERS: >
+      -D glvnd=true
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
     VULKAN_DRIVERS: intel,amd,freedreno