Skip to content

modules/rust: use absolute path for bindgen input when output_inline_wrapper is set #15862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonfrechette-dev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

modules/rust: use absolute path for bindgen input when output_inline_wrapper is set #15862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion mesonbuild/modules/rust.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,9 +932,22 @@ def bindgen(self, state: ModuleState, args: T.List, kwargs: FuncBindgen) -> Modu
'--wrap-static-fns-path', os.path.join(state.environment.build_dir, '@OUTPUT1@')
]

# When output_inline_wrapper is set, bindgen embeds the input path
# verbatim as an #include in the generated wrapper .c file. A relative
# path (from @INPUT@) breaks compilation when the generated file is in
# a build subdirectory, because GCC resolves the include relative to
# the .c file's directory rather than the build root. Use an absolute
# path so the generated #include is always valid. See also:
# https://github.com/mesonbuild/meson/issues/13227
if kwargs['output_inline_wrapper'] and isinstance(header, File):
bindgen_input_arg: T.Union[str, File] = header.absolute_path(
state.environment.source_dir, state.environment.build_dir)
else:
bindgen_input_arg = '@INPUT@'
Comment on lines +942 to +946

cmd = self._bindgen_bin.get_command() + \
[
'@INPUT@', '--output',
bindgen_input_arg, '--output',
os.path.join(state.environment.build_dir, '@OUTPUT0@')
] + \
kwargs['args'] + inline_wrapper_args
Expand Down
Loading