diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-11-11 09:07:04 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-12 11:37:14 -0500 |
| commit | 45996b0f92cf9fa56c6bcbd47d1d5035a95d36df (patch) | |
| tree | 4553d632e13d17efb21c718f3fafe8620d687b92 /mesonbuild/backend/backends.py | |
| parent | 434bb03743c06f222c5d285e53744155f159e7bd (diff) | |
| download | meson-45996b0f92cf9fa56c6bcbd47d1d5035a95d36df.zip meson-45996b0f92cf9fa56c6bcbd47d1d5035a95d36df.tar.gz meson-45996b0f92cf9fa56c6bcbd47d1d5035a95d36df.tar.bz2 | |
vala: Fix compiled object extraction
Fixes #791
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 3 |
1 files changed, 3 insertions, 0 deletions
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): |