From 7bc57d03a59f0148ea84210ea3b424697c32fe3b Mon Sep 17 00:00:00 2001 From: Denis Fortin <71126069+DFOVIT@users.noreply.github.com> Date: Wed, 23 Jun 2021 09:33:38 +0200 Subject: build: fix object path for vs backend --- mesonbuild/backend/backends.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mesonbuild/backend/backends.py') 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) -- cgit v1.1