Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rust: Fix handling of proc-macros in rust-project.json 

The proc-macro code was not running at all because of a missing dash in
the crate type, and the proc macro dylib path was not generated as a
path but including the `-o ` commandline parameter prefix.
This commit is contained in:
Sebastian Dröge 2023-02-28 15:59:25 +02:00 committed by Nirbheek Chauhan
parent 36e2c864d0
commit f5841cb69b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mesonbuild/backend/ninjabackend.py
View File

@ -1778,8 +1778,8 @@ class NinjaBackend(backends.Backend):
return orderdeps, first_file return orderdeps, first_file
def _add_rust_project_entry(self, name: str, main_rust_file: str, args: CompilerArgs, def _add_rust_project_entry(self, name: str, main_rust_file: str, args: CompilerArgs,
from_subproject: bool, is_proc_macro: bool, from_subproject: bool, proc_macro_dylib_path: T.Optional[str],
output: str, deps: T.List[RustDep]) -> None: deps: T.List[RustDep]) -> None:
raw_edition: T.Optional[str] = mesonlib.first(reversed(args), lambda x: x.startswith('--edition')) raw_edition: T.Optional[str] = mesonlib.first(reversed(args), lambda x: x.startswith('--edition'))
edition: RUST_EDITIONS = '2015' if not raw_edition else raw_edition.split('=')[-1] edition: RUST_EDITIONS = '2015' if not raw_edition else raw_edition.split('=')[-1]
@ -1799,8 +1799,8 @@ class NinjaBackend(backends.Backend):
deps, deps,
cfg, cfg,
is_workspace_member=not from_subproject, is_workspace_member=not from_subproject,
is_proc_macro=is_proc_macro, is_proc_macro=proc_macro_dylib_path is not None,
proc_macro_dylib_path=output if is_proc_macro else None, proc_macro_dylib_path=proc_macro_dylib_path,
) )
self.rust_crates[name] = crate self.rust_crates[name] = crate
@ -2021,13 +2021,15 @@ class NinjaBackend(backends.Backend):
for rpath_arg in rpath_args: for rpath_arg in rpath_args:
args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')] args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')]
proc_macro_dylib_path = None
if getattr(target, 'rust_crate_type', '') == 'proc-macro':
proc_macro_dylib_path = os.path.abspath(os.path.join(target.subdir, target.get_filename()))
self._add_rust_project_entry(target.name, self._add_rust_project_entry(target.name,
os.path.abspath(os.path.join(self.environment.build_dir, main_rust_file)), os.path.abspath(os.path.join(self.environment.build_dir, main_rust_file)),
args, args,
bool(target.subproject), bool(target.subproject),
#XXX: There is a fix for this pending proc_macro_dylib_path,
getattr(target, 'rust_crate_type', '') == 'procmacro',
output,
project_deps) project_deps)
compiler_name = self.compiler_to_rule_name(rustc) compiler_name = self.compiler_to_rule_name(rustc)