From cc37ecc7ba300122647d529e966e4c966b8cdc14 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Mon, 29 Jul 2024 15:20:01 +0200 Subject: [PATCH] rusticl: bump rust req to 1.76 Current FireFox ESR requires 1.76, so this is an update according to our rust update policy. Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/build-rust.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- docs/rusticl.rst | 2 +- meson.build | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 50b01382483..da48e662fdd 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -15,7 +15,7 @@ ln -s /usr/local/bin "$HOME"/.cargo/bin # # Also, pick a specific snapshot from rustup so the compiler doesn't drift on # us. -RUST_VERSION=1.73.0-2023-10-05 +RUST_VERSION=1.76.0-2024-02-08 # For rust in Mesa, we use rustup to install. This lets us pick an arbitrary # version of the compiler, rather than whatever the container's Debian comes diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 25465f706c9..718d03f8ff5 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20240717-pyyaml-3" + DEBIAN_BASE_TAG: "20240729-rustc-bump" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "20240717-pyyaml-3" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index 5b7f56e24f2..3080c25e9c6 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -31,7 +31,7 @@ To build Rusticl you need to satisfy the following build dependencies: The minimum versions to build Rusticl are: -- Rust: 1.66 +- Rust: 1.76 - Meson: 1.4.0 - Bindgen: 0.65.0 - LLVM: 15.0.0 diff --git a/meson.build b/meson.build index fcf04c078a9..99637745dfd 100644 --- a/meson.build +++ b/meson.build @@ -848,6 +848,10 @@ if with_gallium_rusticl add_languages('rust', required: true) rustc = meson.get_compiler('rust') + + if rustc.version().version_compare('< 1.76') + error('rusticl requires Rust 1.76.0 or newer') + endif endif with_clover_spirv = with_gallium_clover and get_option('opencl-spirv')