From 45996b0f92cf9fa56c6bcbd47d1d5035a95d36df Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 11 Nov 2016 09:07:04 +0530 Subject: vala: Fix compiled object extraction Fixes #791 --- mesonbuild/backend/backends.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 2861bb6..d799616 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -271,6 +271,9 @@ class Backend(): def object_filename_from_source(self, target, source): if isinstance(source, mesonlib.File): source = source.fname + # foo.vala files compile down to foo.c and then foo.c.o, not foo.vala.o + if source.endswith('.vala'): + source = os.path.join(self.get_target_private_dir(target), source[:-5] + '.c') return source.replace('/', '_').replace('\\', '_') + '.' + self.environment.get_object_suffix() def determine_ext_objs(self, extobj, proj_dir_to_build_root): -- cgit v1.1