aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/backends.py
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2016-08-29 04:29:49 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2016-08-29 04:29:49 -0400
commit6475bdbe20e966e060d984823adaa12dbd6f1011 (patch)
tree7e06d63eb7806d3cf4074f99dfa992851aec928b /mesonbuild/backend/backends.py
parent8e904aaba038dcb4fafbe9c97567776391fd328b (diff)
downloadmeson-6475bdbe20e966e060d984823adaa12dbd6f1011.zip
meson-6475bdbe20e966e060d984823adaa12dbd6f1011.tar.gz
meson-6475bdbe20e966e060d984823adaa12dbd6f1011.tar.bz2
Properly handle Files used in CustomTarget commands.
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 120280f..b5b3b5a 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -547,7 +547,7 @@ class Backend():
tmp = i.get_filename()[0]
i = os.path.join(self.get_target_dir(i), tmp)
elif isinstance(i, mesonlib.File):
- i = os.path.join(i.subdir, i.fname)
+ i = i.rel_to_builddir(self.build_to_src)
if absolute_paths:
i = os.path.join(self.environment.get_build_dir(), i)
# FIXME: str types are blindly added and ignore the 'absolute_paths' argument