WIP: Rust: Make rlib depends on rmeta intermediary output #11707
Conversation
| @@ -2317,7 +2323,8 @@ def generate_cython_compile_rules(self, compiler: 'Compiler') -> None: | |||
|
|
|||
| def generate_rust_compile_rules(self, compiler): | |||
| rule = self.compiler_to_rule_name(compiler) | |||
| command = compiler.get_exelist() + ['$ARGS', '$in'] | |||
| command = compiler.get_exelist() + ['--notify', '$notifyfile', '--emit', 'metadata', '--json=artifacts', '--error-format=json', '$ARGS', '$in'] | |||
There was a problem hiding this comment.
This seems like something we should generate two of, one to build rlibs with a wrapper and the other to execute rustc directly.
There was a problem hiding this comment.
That's a temporary hack to experiment, ideally rustc should support --notify so we don't need a wrapper and don't need to switch to json output.
| args[nargs++] = argv[i]; | ||
| } | ||
| } | ||
| args[0] = "rustc"; |
There was a problem hiding this comment.
This won't respect machine file overrides, I guess... ;)
Probably should take it as a CLI argument.
mesonbuild/backend/ninjabackend.py
Outdated
| @@ -1805,6 +1805,12 @@ def _add_rust_project_entry(self, name: str, main_rust_file: str, args: Compiler | |||
|
|
|||
| self.rust_crates[name] = crate | |||
|
|
|||
| def _get_rust_dependency_name(self, target: build.BuildTarget, dependency: LibTypes) -> str: | |||
There was a problem hiding this comment.
If only there was a common backend class for this :(
| @@ -1884,6 +1884,16 @@ def generate_rust_target(self, target: build.BuildTarget) -> None: | |||
| raise InvalidArguments('Unknown target type for rustc.') | |||
| args.extend(['--crate-type', cratetype]) | |||
|
|
|||
| # dependencies need to cause a relink, they're not just for ordering. | |||
There was a problem hiding this comment.
Run-on sentence. It would be nice to have a comment with a link to what an rmeta file is.
| type: dict[str] | ||
| since: 1.2.0 | ||
| description: | | ||
| On rust targets this provides a map of library names to the crate name |
There was a problem hiding this comment.
Capitalize rust. @sdroege is the use of library here correct?
mesonbuild/build.py
Outdated
| @@ -1236,6 +1236,13 @@ def process_kwargs(self, kwargs): | |||
| if self.gnu_symbol_visibility not in permitted: | |||
| raise InvalidArguments('GNU symbol visibility arg {} not one of: {}'.format(self.gnu_symbol_visibility, ', '.join(permitted))) | |||
|
|
|||
| rust_dependency_map = kwargs.get('rust_dependency_map', {}) | |||
| if not isinstance(rust_dependency_map, dict): | |||
There was a problem hiding this comment.
Seems like yet another thing that @dcbaker would have to rebase his build.py refactor on. Perhaps we should try to get that in first?
When compiling rlib, rustc can generate an intermediary rmeta file that is enough to build another rlib that depends on it.
When compiling rlib, rustc can generate an intermediary rmeta file that
is enough to build another rlib that depends on it.