aboutsummaryrefslogtreecommitdiff
path: root/ninjabackend.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-05 15:43:46 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-05 15:43:46 +0200
commit52b69b8939c7b16e344c3756292ab803abbeae6b (patch)
tree7138ff8a903255bb8ab2f2d14c25d0ac8fff2b60 /ninjabackend.py
parentec491e200ba82f6f6d0df2f10ae4a607efeb3657 (diff)
downloadmeson-52b69b8939c7b16e344c3756292ab803abbeae6b.zip
meson-52b69b8939c7b16e344c3756292ab803abbeae6b.tar.gz
meson-52b69b8939c7b16e344c3756292ab803abbeae6b.tar.bz2
Make sure that build and source subdirectories are always in search
path.
Diffstat (limited to 'ninjabackend.py')
-rw-r--r--ninjabackend.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 4fa4734..66bae36 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -1103,6 +1103,11 @@ rule FORTRAN_DEP_HACK
compiler = self.get_compiler_for_source(src)
commands = self.generate_basic_compiler_args(target, compiler)
commands += compiler.get_include_args(self.get_target_private_dir(target))
+ curdir = target.get_subdir()
+ commands += compiler.get_include_args(os.path.join(self.build_to_src, curdir))
+ if curdir == '':
+ curdir = '.'
+ commands += compiler.get_include_args(curdir)
for d in target.external_deps:
if d.need_threads():
commands += compiler.thread_flags()