diff options
| author | Philipp Ittershagen <pit@shgn.de> | 2017-10-25 19:58:57 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-11-08 21:18:48 +0200 |
| commit | a176588151bd5809ed85929d5513cfd5a8791473 (patch) | |
| tree | b4d379c96e552e43045d401d068ccd595b7d6239 /mesonbuild/interpreter.py | |
| parent | 416a6fc2358c9077e73cf1cca45ff05579c0979c (diff) | |
| download | meson-a176588151bd5809ed85929d5513cfd5a8791473.zip meson-a176588151bd5809ed85929d5513cfd5a8791473.tar.gz meson-a176588151bd5809ed85929d5513cfd5a8791473.tar.bz2 | |
fix include_directories handling in subprojects for compiler tests.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 28cb5ad..b90a88c 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -696,7 +696,8 @@ class CompilerHolder(InterpreterObject): if not isinstance(i, IncludeDirsHolder): raise InterpreterException('Include directories argument must be an include_directories object.') for idir in i.held_object.get_incdirs(): - idir = os.path.join(self.environment.get_source_dir(), idir) + idir = os.path.join(self.environment.get_source_dir(), + i.held_object.get_curdir(), idir) args += self.compiler.get_include_args(idir, False) if not nobuiltins: opts = self.environment.coredata.compiler_options |