aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/backends.py
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-06-13 06:29:57 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2017-08-14 22:47:35 -0400
commitb68cb3c713337dda159faf203ece775d30825a1d (patch)
tree35b7cd27e85d6a7dbbffaf5d5956415b6b185743 /mesonbuild/backend/backends.py
parent879770ccf00f875618960f2063faaeb387377f88 (diff)
downloadmeson-b68cb3c713337dda159faf203ece775d30825a1d.zip
meson-b68cb3c713337dda159faf203ece775d30825a1d.tar.gz
meson-b68cb3c713337dda159faf203ece775d30825a1d.tar.bz2
Use object_filename_from_source when creating objects.
This will ensure a consistent path between generated object names and names expected of extracted objects.
Diffstat (limited to 'mesonbuild/backend/backends.py')
-rw-r--r--mesonbuild/backend/backends.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index f967de0..0496b38 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -315,7 +315,7 @@ class Backend:
if source.endswith(('.vala', '.gs')):
if is_unity:
return source[:-5] + '.c.' + self.environment.get_object_suffix()
- source = os.path.join(self.get_target_private_dir(target), source[:-5] + '.c')
+ source = source[:-5] + '.c'
return source.replace('/', '_').replace('\\', '_') + '.' + self.environment.get_object_suffix()
def determine_ext_objs(self, target, extobj, proj_dir_to_build_root):