aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/vala.py
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-01-08 21:59:50 -0500
committerDylan Baker <dylan@pnwbakers.com>2019-02-15 09:17:24 -0800
commitd451a4bd97f827bb492fd0c0e357cb20b6056ed9 (patch)
treefa2b4704bb0132e81b2102ced301b5a7ac51c8de /mesonbuild/compilers/vala.py
parent3e9396f2590372f484149b48bf3f1c108c9111c3 (diff)
downloadmeson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.zip
meson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.tar.gz
meson-d451a4bd97f827bb492fd0c0e357cb20b6056ed9.tar.bz2
Remove get_cross_extra_flags
This is no longer needed, we just remove conditionals around it.
Diffstat (limited to 'mesonbuild/compilers/vala.py')
-rw-r--r--mesonbuild/compilers/vala.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index 5303298..1ee46fe 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -87,8 +87,7 @@ class ValaCompiler(Compiler):
def sanity_check(self, work_dir, environment):
code = 'class MesonSanityCheck : Object { }'
- args = self.get_cross_extra_flags(environment, link=False)
- with self.compile(code, args, 'compile') as p:
+ with self.compile(code, [], 'compile') as p:
if p.returncode != 0:
msg = 'Vala compiler {!r} can not compile programs' \
''.format(self.name_string())
@@ -107,9 +106,7 @@ class ValaCompiler(Compiler):
if not extra_dirs:
code = 'class MesonFindLibrary : Object { }'
vapi_args = ['--pkg', libname]
- args = self.get_cross_extra_flags(env, link=False)
- args += vapi_args
- with self.compile(code, args, 'compile') as p:
+ with self.compile(code, vapi_args, 'compile') as p:
if p.returncode == 0:
return vapi_args
# Not found? Try to find the vapi file itself.