diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-07 23:19:16 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-08 15:00:42 -0500 |
| commit | 841380acfe682023b0df9fa76debbe3030f31daa (patch) | |
| tree | 9c8d09ea5e1c54fc3a400f2db472282068ac9e8f /mesonbuild/backend/ninjabackend.py | |
| parent | 87f07cdf3db9923b41ac23d27d8e017c8c57ecc3 (diff) | |
| download | meson-841380acfe682023b0df9fa76debbe3030f31daa.zip meson-841380acfe682023b0df9fa76debbe3030f31daa.tar.gz meson-841380acfe682023b0df9fa76debbe3030f31daa.tar.bz2 | |
Search for headers in build dir before source dir. Closes #984.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8329b59..0f8dcae 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1720,10 +1720,11 @@ rule FORTRAN_DEP_HACK # Add the root source and build directories as include dirs curdir = target.get_subdir() tmppath = os.path.normpath(os.path.join(self.build_to_src, curdir)) - commands += compiler.get_include_args(tmppath, False) + src_inc = compiler.get_include_args(tmppath, False) if curdir == '': curdir = '.' - commands += compiler.get_include_args(curdir, False) + build_inc = compiler.get_include_args(curdir, False) + commands += build_inc + src_inc # -I args work differently than other ones. In them the first found # directory is used whereas for other flags (such as -ffoo -fno-foo) the # latest one is used. Therefore put the internal include directories |