diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2023-02-27 11:45:02 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2023-03-01 20:56:53 +0530 |
| commit | 36e2c864d0ff9889829886889db20d7f655445c6 (patch) | |
| tree | 897b80938b0b3a846efdcfb592e73a9bca04a230 | |
| parent | b27104d92040a6e4976ec4d4e1f11b3196d6ea0a (diff) | |
| download | meson-36e2c864d0ff9889829886889db20d7f655445c6.tar.gz | |
rust: Store absolute paths in rust-project.json
As meson requires source_dir!=build_dir and stores the rust-project.json
inside the build directory, while software like rust-analyzer expects it
at the root of the source directory, manual steps are needed for making
them work together.
One option, as described in the documentation, is per project
configuration. Another option, that works correctly with
compile-commands.json and clangd, is to store a symlink to the file in
the build directory at the root of the source directory.
As currently rust-project.json stores paths relative to the location of
the file itself and rust-analyzer does not resolve symlinks, this does
not work.
To solve this, store absolute paths in rust-project.json as is already
done in compile_commands.json for the directory.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 3d6bfb906..8a0465db9 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2021,10 +2021,14 @@ class NinjaBackend(backends.Backend): for rpath_arg in rpath_args: args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')] - self._add_rust_project_entry(target.name, main_rust_file, args, bool(target.subproject), + self._add_rust_project_entry(target.name, + os.path.abspath(os.path.join(self.environment.build_dir, main_rust_file)), + args, + bool(target.subproject), #XXX: There is a fix for this pending getattr(target, 'rust_crate_type', '') == 'procmacro', - output, project_deps) + output, + project_deps) compiler_name = self.compiler_to_rule_name(rustc) element = NinjaBuildElement(self.all_outputs, target_name, compiler_name, main_rust_file) |