[PULL,05/40] meson: import rust module into a global variable

Commit Message

Paolo Bonzini Nov. 4, 2024, 5:26 p.m. UTC

Tested-by: Manos Pitsidianakis <[e-mail]>
Reviewed-by: Manos Pitsidianakis <[e-mail]>
Reviewed-by: Zhao Liu <[e-mail]>
Reviewed-by: Kevin Wolf <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 meson.build                      | 3 ++-
 rust/qemu-api-macros/meson.build | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/meson.build b/meson.build
index f7d45175212..dd6193c4c37 100644
--- a/meson.build
+++ b/meson.build
@@ -15,6 +15,7 @@  meson.add_postconf_script(find_program('scripts/symlink-install-tree.py'))
 
 not_found = dependency('', required: false)
 keyval = import('keyval')
+rust = import('rust')
 ss = import('sourceset')
 fs = import('fs')
 
@@ -3977,7 +3978,7 @@  if have_rust and have_system
   # this case you must pass the path to `clang` and `libclang` to your build
   # command invocation using the environment variables CLANG_PATH and
   # LIBCLANG_PATH
-  bindings_rs = import('rust').bindgen(
+  bindings_rs = rust.bindgen(
     input: 'rust/wrapper.h',
     dependencies: common_ss.all_dependencies(),
     output: 'bindings.rs',
diff --git a/rust/qemu-api-macros/meson.build b/rust/qemu-api-macros/meson.build
index 517b9a4d2d5..24325dea5c2 100644
--- a/rust/qemu-api-macros/meson.build
+++ b/rust/qemu-api-macros/meson.build
@@ -2,7 +2,7 @@  quote_dep = dependency('quote-1-rs', native: true)
 syn_dep = dependency('syn-2-rs', native: true)
 proc_macro2_dep = dependency('proc-macro2-1-rs', native: true)
 
-_qemu_api_macros_rs = import('rust').proc_macro(
+_qemu_api_macros_rs = rust.proc_macro(
   'qemu_api_macros',
   files('src/lib.rs'),
   override_options: ['rust_std=2021', 'build.rust_std=2021'],