diff options
| author | Sam James <sam@gentoo.org> | 2024-05-24 05:27:57 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2024-05-24 17:10:20 -0400 |
| commit | a66cb97e8cd29e6d8c89232b8e3763677ad3825f (patch) | |
| tree | 9cdddf8ef906957b12be1a0c5dc4de38e9dba386 /mesonbuild/build.py | |
| parent | 5365d9a842938dc9182b52bcdb9674a434475200 (diff) | |
| download | meson-a66cb97e8cd29e6d8c89232b8e3763677ad3825f.zip meson-a66cb97e8cd29e6d8c89232b8e3763677ad3825f.tar.gz meson-a66cb97e8cd29e6d8c89232b8e3763677ad3825f.tar.bz2 | |
Revert "rust: recursively pull proc-macro dependencies as well"
This reverts commit aee941559c4b88a062e88186819a820c69c200ae.
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
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index d8afd1b..313f73e 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1292,6 +1292,8 @@ class BuildTarget(Target): for t in self.link_targets: if t in result: continue + if t.rust_crate_type == 'proc-macro': + continue if include_internals or not t.is_internal(): result.add(t) if isinstance(t, StaticLibrary): |