diff options
author | Denis Fortin <71126069+DFOVIT@users.noreply.github.com> | 2021-06-23 09:33:38 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-06-28 23:15:30 +0300 |
commit | 7bc57d03a59f0148ea84210ea3b424697c32fe3b (patch) | |
tree | e91733ba67e9ae6f67af478f43e0310c476521fb /mesonbuild/backend/backends.py | |
parent | 3e66bd40356c0d223af86dabc8f119a41c345378 (diff) | |
download | meson-7bc57d03a59f0148ea84210ea3b424697c32fe3b.zip meson-7bc57d03a59f0148ea84210ea3b424697c32fe3b.tar.gz meson-7bc57d03a59f0148ea84210ea3b424697c32fe3b.tar.bz2 |
build: fix object path for vs backend
Diffstat (limited to 'mesonbuild/backend/backends.py')
-rw-r--r-- | mesonbuild/backend/backends.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index a342acc..c489dce 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -412,7 +412,14 @@ class Backend: self.build_to_src, target.get_subdir(), obj) obj_list.append(o) elif isinstance(obj, mesonlib.File): - obj_list.append(obj.rel_to_builddir(self.build_to_src)) + if obj.is_built: + o = os.path.join(proj_dir_to_build_root, + obj.rel_to_builddir(self.build_to_src)) + obj_list.append(o) + else: + o = os.path.join(proj_dir_to_build_root, + self.build_to_src) + obj_list.append(obj.rel_to_builddir(o)) elif isinstance(obj, build.ExtractedObjects): if obj.recursive: obj_list += self._flatten_object_list(obj.target, obj.objlist, proj_dir_to_build_root) |