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 e5ae08ce7777e6e2e490756fc077bdbe26e8dbab..a43e69c00e466b394448bb891967e99bdf3e1bd7 100644 (file)
--- 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 2bf51de1cd69214ab1aab09ab75d63e11934f294..04b0189e254315864e00def39e68a6f059fc4ba3 100755 (executable)
--- 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} \