From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 19 Nov 2019 13:37:32 +0000 (+0100)
Subject: gitlab-ci: build GLVND in meson-clang
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7362176cfe47bc372caca1e90c85bb8758f42687;p=mesa.git

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@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
---

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