summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-08-09 23:46:50 +0100
committerEric Engestrom <eric.engestrom@intel.com>2019-08-10 12:11:28 +0100
commit1c82fa0a92538e7673a6ea4bb6088c39059b3390 (patch)
treee9515f1a2fab15c81be9d4d75a3ae2f48f17ceda
parentf1dba99639594decd37b1fc80f92aab8eb985361 (diff)
gitlab-ci: simplify $CROSS option
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r--.gitlab-ci.yml6
-rwxr-xr-x.gitlab-ci/meson-build.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69dd3fa0a66..b986d439a6c 100644
--- 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 c7fef6fc315..d0df91fa394 100755
--- 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 \