diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-12-05 09:15:06 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-12-17 14:04:17 -0800 |
| commit | a152da9206891caad17fd9271aff04073e811784 (patch) | |
| tree | dfbcf9fd6eb8be2906ec0f140691d48841c1e753 /test cases | |
| parent | 7a1655acd29e5ba50a2951ad6c8db934fa7a6eb9 (diff) | |
| download | meson-a152da9206891caad17fd9271aff04073e811784.tar.gz | |
build|interpreter: use typed_kwargs for link_with
This replaces the long explanation of `external_library`s in the
`link_with` parameter to the simpler one used by declare_dependency.
Additionally, declare_dependency now checks that a target is linkable
when adding it. This just catches the problem before it goes down into
the build layer giving a better error message.
There is a bug in the declare_dependency annotations, in that they don't
mark Executable as acceptable. So I've fixed that.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/failing/52 link with executable/test.json | 2 | ||||
| -rw-r--r-- | test cases/failing/59 string as link target/test.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test cases/failing/52 link with executable/test.json b/test cases/failing/52 link with executable/test.json index ba9c34549..976d96706 100644 --- a/test cases/failing/52 link with executable/test.json +++ b/test cases/failing/52 link with executable/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/52 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable." + "line": "test cases/failing/52 link with executable/meson.build:4:4: ERROR: shared_module keyword argument \"link_with\" Link target \"prog\" is not linkable" } ] } diff --git a/test cases/failing/59 string as link target/test.json b/test cases/failing/59 string as link target/test.json index ddc639980..2ecfaf02a 100644 --- a/test cases/failing/59 string as link target/test.json +++ b/test cases/failing/59 string as link target/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/59 string as link target/meson.build:2:0: ERROR: '' is not a target." + "line": "test cases/failing/59 string as link target/meson.build:2:0: ERROR: executable keyword argument 'link_with' was of type array[str] but should have been array[BothLibraries | SharedLibrary | StaticLibrary | CustomTarget | CustomTargetIndex | Jar | Executable]" } ] } |
