From 47ebdbab814f3bd10286f5d23a1447a9b933be00 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 4 Dec 2025 15:57:23 +0100 Subject: [PATCH] meson: add rust_global_args for flags for all the rust compilations Part-of: --- meson.build | 3 +++ src/compiler/rust/meson.build | 2 ++ src/etnaviv/isa/meson.build | 2 ++ src/gallium/frontends/rusticl/meson.build | 2 ++ src/nouveau/compiler/latencies/meson.build | 1 + src/nouveau/compiler/meson.build | 1 + src/nouveau/headers/meson.build | 1 + src/nouveau/rust/meson.build | 1 + src/util/rust/meson.build | 1 + src/virtio/protocols/meson.build | 1 + src/virtio/virtgpu_kumquat/meson.build | 1 + src/virtio/virtgpu_kumquat_ffi/meson.build | 1 + 12 files changed, 17 insertions(+) diff --git a/meson.build b/meson.build index 9b5d53c3adb..de9ec52c487 100644 --- a/meson.build +++ b/meson.build @@ -820,6 +820,9 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv') or bindgen_output_args += ['--raw-line', '#![allow(unnecessary_transmutes)]'] endif + rust_global_args = [ + ] + rust_2024_lint_args = [ '-Dboxed_slice_into_iter', '-Ddeprecated_safe_2024', diff --git a/src/compiler/rust/meson.build b/src/compiler/rust/meson.build index 244fb00e1a4..2dbf2bfe176 100644 --- a/src/compiler/rust/meson.build +++ b/src/compiler/rust/meson.build @@ -39,6 +39,7 @@ _compiler_binding_types = [ ] _compiler_rust_args = [ + rust_global_args, rust_2024_lint_args, '-Aclippy::identity_op', '-Aclippy::len_zero', @@ -159,6 +160,7 @@ _libcompiler_proc_rs = static_library( gnu_symbol_visibility : 'hidden', dependencies : [dep_syn], rust_abi : 'rust', + rust_args : rust_global_args, native : true, ) diff --git a/src/etnaviv/isa/meson.build b/src/etnaviv/isa/meson.build index 2edb7178bf7..94a4a9575e9 100644 --- a/src/etnaviv/isa/meson.build +++ b/src/etnaviv/isa/meson.build @@ -153,6 +153,7 @@ if with_tools.contains('etnaviv') 'etnaviv_isa_proc', files('isa_proc.rs', 'isa.rs'), dependencies : [dep_indexmap, dep_roxmltree, dep_syn, dep_pest_generator], + rust_args : rust_global_args, ) if with_tests @@ -165,6 +166,7 @@ if with_tools.contains('etnaviv') files('lib.rs'), gnu_symbol_visibility : 'hidden', rust_abi : 'c', + rust_args : rust_global_args, dependencies: [dep_indexmap, dep_roxmltree, dep_pest], link_with: [_libetnaviv_isa_bindings_gen, _libetnaviv_isa_proc_rs], ) diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build index f42ebac43cc..cd9f05b6917 100644 --- a/src/gallium/frontends/rusticl/meson.build +++ b/src/gallium/frontends/rusticl/meson.build @@ -64,6 +64,7 @@ rusticl_files = files( ) rusticl_args = [ + rust_global_args, rust_2024_lint_args, # Should be ran manually before moving to the 2024 edition @@ -451,6 +452,7 @@ if meson.version().version_compare('>= 1.9.0') and with_tests 'rusticl_test', 'test/lib.rs', rust_abi : 'c', + rust_args : rust_global_args, ) rust.test('rusticl_opencl_gen_test', rusticl_opencl_gen, suite : ['rusticl']) diff --git a/src/nouveau/compiler/latencies/meson.build b/src/nouveau/compiler/latencies/meson.build index bf10b879a06..48dd47bbf93 100644 --- a/src/nouveau/compiler/latencies/meson.build +++ b/src/nouveau/compiler/latencies/meson.build @@ -56,4 +56,5 @@ libnak_latencies_rs = static_library( _nak_latencies_lib_rs, gnu_symbol_visibility : 'hidden', rust_abi : 'rust', + rust_args : rust_global_args, ) diff --git a/src/nouveau/compiler/meson.build b/src/nouveau/compiler/meson.build index 3c4a6bd1367..317ad79fee1 100644 --- a/src/nouveau/compiler/meson.build +++ b/src/nouveau/compiler/meson.build @@ -96,6 +96,7 @@ _libnak_ir_proc_rs = rust.proc_macro( 'nak_ir_proc', files('nak/ir_proc.rs'), dependencies : [idep_compiler_proc_rs], + rust_args : rust_global_args, ) _libnak_rs = static_library( diff --git a/src/nouveau/headers/meson.build b/src/nouveau/headers/meson.build index fe5584aad7f..d9717ac6ce3 100644 --- a/src/nouveau/headers/meson.build +++ b/src/nouveau/headers/meson.build @@ -229,6 +229,7 @@ if with_nouveau_vk files('nv_push_rs/lib.rs'), gnu_symbol_visibility: 'hidden', rust_abi: 'rust', + rust_args : rust_global_args, dependencies: [idep_nvidia_headers_rs], ) diff --git a/src/nouveau/rust/meson.build b/src/nouveau/rust/meson.build index a6c3e74ac37..22046d40243 100644 --- a/src/nouveau/rust/meson.build +++ b/src/nouveau/rust/meson.build @@ -2,6 +2,7 @@ # SPDX-License-Identifier: MIT nouveau_rust_args = [ + rust_global_args, rust_2024_lint_args, '-Aclippy::identity_op', '-Aclippy::len_zero', diff --git a/src/util/rust/meson.build b/src/util/rust/meson.build index 8a737def019..59963c465f0 100644 --- a/src/util/rust/meson.build +++ b/src/util/rust/meson.build @@ -45,5 +45,6 @@ libmesa_rust_util = static_library( 'lib.rs', gnu_symbol_visibility : 'hidden', rust_abi : 'rust', + rust_args : rust_global_args, dependencies: dep_mesa3d_util, ) diff --git a/src/virtio/protocols/meson.build b/src/virtio/protocols/meson.build index 09b17feb9f5..64eabb35fd6 100644 --- a/src/virtio/protocols/meson.build +++ b/src/virtio/protocols/meson.build @@ -6,6 +6,7 @@ libmesa_protocols = static_library( 'lib.rs', gnu_symbol_visibility : 'hidden', rust_abi : 'rust', + rust_args : rust_global_args, link_with: [libmesa_rust_util], dependencies: dep_mesa3d_util ) diff --git a/src/virtio/virtgpu_kumquat/meson.build b/src/virtio/virtgpu_kumquat/meson.build index 50e12e45c67..656b33f6f6c 100644 --- a/src/virtio/virtgpu_kumquat/meson.build +++ b/src/virtio/virtgpu_kumquat/meson.build @@ -6,6 +6,7 @@ libvirtgpu_kumquat = static_library( 'lib.rs', gnu_symbol_visibility : 'hidden', rust_abi : 'rust', + rust_args : rust_global_args, link_with: [libmesa_protocols, libmesa_rust_util], dependencies: [dep_mesa3d_util] ) diff --git a/src/virtio/virtgpu_kumquat_ffi/meson.build b/src/virtio/virtgpu_kumquat_ffi/meson.build index 381f76fe78e..7138e3847b6 100644 --- a/src/virtio/virtgpu_kumquat_ffi/meson.build +++ b/src/virtio/virtgpu_kumquat_ffi/meson.build @@ -20,6 +20,7 @@ libvirtgpu_kumquat_ffi = static_library( gnu_symbol_visibility : 'hidden', rust_abi : 'c', rust_args : [ + rust_global_args, virtgpu_kumquat_ffi_args, ], link_with: [libmesa_protocols, libmesa_rust_util, libvirtgpu_kumquat],