diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2022-08-22 14:29:16 -0700 |
---|---|---|
committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-08-24 22:50:35 -0400 |
commit | 741de254623cac7577c935ea45056390fcd708c4 (patch) | |
tree | 9c650285e5b6b775a17b3e9c9f90d3e67949dc23 /mesonbuild/build.py | |
parent | f8ebfdf7b1f33f88007d107791a661a17827be43 (diff) | |
download | meson-741de254623cac7577c935ea45056390fcd708c4.zip meson-741de254623cac7577c935ea45056390fcd708c4.tar.gz meson-741de254623cac7577c935ea45056390fcd708c4.tar.bz2 |
build: Don't attempt to link-whole with rust convenience libraries
There are two distinct cases here that need to be considered. The first
issue is https://github.com/mesonbuild/meson/issues/10723 and
https://github.com/mesonbuild/meson/issues/10724, which means that Meson
can't actually generate link-whole arguments with rust targets. The
second is that rlibs are never valid candidates for link-whole anyway.
The promotion happens to work because of another bug in the promotion
path (which is fixed in the next commit).
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index c7f5997..b866bd0 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1416,9 +1416,17 @@ You probably should put it in link_with instead.''') mlog.warning(f'Try to link an installed static library target {self.name} with a' 'custom target that is not installed, this might cause problems' 'when you try to use this static library') - elif t.is_internal(): + elif t.is_internal() and not t.uses_rust(): # When we're a static library and we link_with to an # internal/convenience library, promote to link_whole. + # + # There are cases we cannot do this, however. In Rust, for + # example, this can't be done with Rust ABI libraries, though + # it could be done with C ABI libraries, though there are + # several meson issues that need to be fixed: + # https://github.com/mesonbuild/meson/issues/10722 + # https://github.com/mesonbuild/meson/issues/10723 + # https://github.com/mesonbuild/meson/issues/10724 return self.link_whole(t) if not isinstance(t, (Target, CustomTargetIndex)): raise InvalidArguments(f'{t!r} is not a target.') |