gitlab-ci: simplify $CROSS option

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69dd3fa0a66ca8707e522356d24f46654794ccb6..b986d439a6c3c37cc72c4d029807c5a0ec220d3e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -257,7 +257,7 @@ meson-vulkan:
 meson-armhf:
   extends: .meson-cross
   variables:
-    CROSS: --cross /cross_file-armhf.txt
+    CROSS: armhf
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -269,7 +269,7 @@ meson-armhf:
 meson-arm64:
   extends: .meson-cross
   variables:
-    CROSS: --cross /cross_file-arm64.txt
+    CROSS: arm64
     VULKAN_DRIVERS: freedreno
     GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
     # Disable the tests since we're cross compiling.
@@ -281,7 +281,7 @@ meson-arm64:
 meson-i386:
   extends: .meson-cross
   variables:
-    CROSS: --cross /cross_file-i386.txt
+    CROSS: i386
     VULKAN_DRIVERS: intel
     GALLIUM_DRIVERS: "swrast"
     # Disable i386 tests, because u_format_tests gets precision

diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index c7fef6fc3157f805fceb64e180c5a804ba3e56c7..d0df91fa3949988ba85c54629fa0de8335c46b93 100755 (executable)
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -16,7 +16,7 @@ fi
 
 rm -rf _build
 meson _build --native-file=native.file \
-      ${CROSS} \
+      ${CROSS+--cross /cross_file-$CROSS.txt} \
       -D libdir=lib \
       -D buildtype=debug \
       -D build-tests=true \