aboutsummaryrefslogtreecommitdiff
path: root/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-11-20 01:15:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-11-20 01:15:51 +0200
commit86a6915077066385d480211a159dba764ef85d3d (patch)
tree2ff133cb61a7982f827bb424a6ffb695e58c8956 /ninjabackend.py
parentc75b75d487d8a57fbcab9c48305c0003a91fb811 (diff)
downloadmeson-86a6915077066385d480211a159dba764ef85d3d.zip
meson-86a6915077066385d480211a159dba764ef85d3d.tar.gz
meson-86a6915077066385d480211a159dba764ef85d3d.tar.bz2
Fix unity build. Closes #310.
Diffstat (limited to 'ninjabackend.py')
-rw-r--r--ninjabackend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 7696f15..0b19b09 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -265,8 +265,8 @@ class NinjaBackend(backends.Backend):
if not self.environment.is_header(src):
src_list.append(src)
if is_unity:
- abs_src = os.path.join(self.environment.get_source_dir(),
- target.get_subdir(), src)
+ abs_src = os.path.join(self.environment.get_build_dir(),
+ src.rel_to_builddir(self.build_to_src))
unity_src.append(abs_src)
else:
obj_list.append(self.generate_single_compile(target, outfile, src, False, [], header_deps))