summaryrefslogtreecommitdiff
path: root/test cases/vala
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2017-06-17 15:04:26 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-06-17 12:34:26 +0300
commit73c06780f93f7565a39def7ed08e404fbcaae358 (patch)
tree35755bbdb42e8b4e69878e1c0acd7c835780d4c6 /test cases/vala
parentf1996f7291f9735f80b94b3893832829273c906c (diff)
downloadmeson-73c06780f93f7565a39def7ed08e404fbcaae358.tar.gz
Make external library no-op when used with incompatible target (#1941)
* tests: Add a test for C library in Vala target https://github.com/mesonbuild/meson/issues/1939 * Make external library no-op when used with incompatible target This is how it used to behave earlier, but we accidentally regressed Closes https://github.com/mesonbuild/meson/issues/1939
Diffstat (limited to 'test cases/vala')
-rw-r--r--test cases/vala/16 mixed dependence/meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/test cases/vala/16 mixed dependence/meson.build b/test cases/vala/16 mixed dependence/meson.build
index e6967be00..b44b47b31 100644
--- a/test cases/vala/16 mixed dependence/meson.build
+++ b/test cases/vala/16 mixed dependence/meson.build
@@ -1,6 +1,10 @@
project('mixed dependence', 'vala', 'c')
-deps = [dependency('glib-2.0'), dependency('gobject-2.0')]
+cc = meson.get_compiler('c')
+
+deps = [dependency('glib-2.0'), dependency('gobject-2.0'),
+ # Should be ignored, see https://github.com/mesonbuild/meson/issues/1939
+ cc.find_library('z')]
mixer = static_library('mixer', 'mixer.vala', 'mixer-glue.c',
dependencies : deps)