Skip to content

Commit

Permalink
Revert "rust: recursively pull proc-macro dependencies as well"
Browse files Browse the repository at this point in the history
This reverts commit aee9415.

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: #12973
  • Loading branch information
thesamesam authored and eli-schwartz committed May 24, 2024
1 parent 5365d9a commit a66cb97
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 27 deletions.
2 changes: 2 additions & 0 deletions mesonbuild/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,8 @@ def get_dependencies_recurse(self, result: OrderedSet[BuildTargetTypes], include
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):
Expand Down
8 changes: 0 additions & 8 deletions test cases/rust/18 proc-macro/lib.rs

This file was deleted.

11 changes: 0 additions & 11 deletions test cases/rust/18 proc-macro/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,3 @@ main = executable(
)

test('main_test2', main)

subdir('subdir')

staticlib = static_library('staticlib', 'lib.rs',
link_with: pm_in_subdir,
rust_dependency_map : {'proc_macro_examples3' : 'proc_macro_examples'}
)

executable('transitive-proc-macro', 'transitive-proc-macro.rs',
link_with: staticlib,
)
1 change: 0 additions & 1 deletion test cases/rust/18 proc-macro/subdir/meson.build

This file was deleted.

7 changes: 0 additions & 7 deletions test cases/rust/18 proc-macro/transitive-proc-macro.rs

This file was deleted.

0 comments on commit a66cb97

Please sign in to comment.