meson

15128 Commits

76 Branches

171 Tags

74 MiB

Tag: Branch: Tree: 731dcdf92f

Commit Graph

Author SHA1 Message Date

Author	SHA1	Message	Date
Alyssa Ross	a05f6a260e	rust: recursively pull proc-macro deps for rust targets `aee941559` ("rust: recursively pull proc-macro dependencies as well") had to be reverted (in `a66cb97e8`) because it broke Mesa cross compilation. This happened because a C shared library was linked with a Rust C-ABI static library, which caused it to inherit the proc macro dependency the Rust static library was linked with. The right way to handle this is for only Rust targets to inherit proc macro dependencies from static libraries they link with. A Rust executable, library, or whatever will need the proc macros its Rust dependencies use, as illustrated in the test case that I've reintroduced here. I've verified that Mesa still cross compiles correctly with this change. The same failure was also identified by the "rust/21 transitive dependencies" test case, but only when cross compiling, so it wasn't caught by CI. Co-authored-by: Xavier Claessens <xavier.claessens@collabora.com>	4 months ago
Sam James	a66cb97e8c	Revert "rust: recursively pull proc-macro dependencies as well" This reverts commit `aee941559c`. The commit being reverted breaks compilation of a major Meson consumer (Mesa). As a result, various distros are either pinning to <1.4.0 (before the commit) or performing this same revert downstream. Fixing a regression takes priority, so let's revert. Fixes: https://github.com/mesonbuild/meson/issues/12973	6 months ago
Xavier Claessens	aee941559c	rust: recursively pull proc-macro dependencies as well When the proc-macro rlib is in a different subdir, it would miss the needed -L argument and rustc would not find it. Meson was assuming that proc-macros are only needed when building libraries that uses it, but it turns out that was wrong, as show by the unit test.	9 months ago

Alyssa Ross

a05f6a260e

rust: recursively pull proc-macro deps for rust targets

aee941559 ("rust: recursively pull proc-macro dependencies as well")
had to be reverted (in a66cb97e8) because it broke Mesa cross
compilation.  This happened because a C shared library was linked with
a Rust C-ABI static library, which caused it to inherit the proc macro
dependency the Rust static library was linked with.

The right way to handle this is for only Rust targets to inherit proc
macro dependencies from static libraries they link with.  A Rust
executable, library, or whatever will need the proc macros its Rust
dependencies use, as illustrated in the test case that I've
reintroduced here.

I've verified that Mesa still cross compiles correctly with this
change.  The same failure was also identified by the "rust/21
transitive dependencies" test case, but only when cross compiling, so
it wasn't caught by CI.

Co-authored-by: Xavier Claessens <xavier.claessens@collabora.com>

4 months ago

Sam James

a66cb97e8c

Revert "rust: recursively pull proc-macro dependencies as well"

This reverts commit aee941559c.

The commit being reverted breaks compilation of a major Meson consumer
(Mesa). As a result, various distros are either pinning to <1.4.0 (before
the commit) or performing this same revert downstream.

Fixing a regression takes priority, so let's revert.

Fixes: https://github.com/mesonbuild/meson/issues/12973

6 months ago

Xavier Claessens

aee941559c

rust: recursively pull proc-macro dependencies as well

When the proc-macro rlib is in a different subdir, it would miss the
needed -L argument and rustc would not find it. Meson was assuming that
proc-macros are only needed when building libraries that uses it, but it
turns out that was wrong, as show by the unit test.

9 months ago

3 Commits (731dcdf92fdb0e4675f61e028eb83ff31e8893f5)