From: Eric Anholt <eric@anholt.net>
Date: Tue, 23 Jul 2019 18:12:07 +0000 (-0700)
Subject: gitlab-ci: Always set libdir to lib/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f68b98738750e5a526fd801824592b70cc6d8ce5;p=mesa.git

gitlab-ci: Always set libdir to lib/

I introduced libdir for cross-builds so we could point at the
resulting drivers without per-arch dependencies, but I'd rather not
have to type x86_64-linux-whatever for non-cross-builds either.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5ae08ce777..a43e69c00e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,7 +247,6 @@ meson-vulkan:
       -D gallium-nine=false
       -D llvm=false
     CROSS: >
-      --libdir lib
       --cross /tmp/cross_file.txt
 
   script:
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index 2bf51de1cd6..04b0189e254 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -17,6 +17,7 @@ fi
 rm -rf _build
 meson _build --native-file=native.file \
       ${CROSS} \
+      -D libdir=lib \
       -D buildtype=debug \
       -D build-tests=true \
       -D libunwind=${UNWIND} \