diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-25 20:26:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 20:26:02 +0300 |
| commit | f6f07840388db4aa5800ac4b69211c8b2cb87a70 (patch) | |
| tree | 61b4217ad03893063fb1ecdd32eb8230aa642185 /mesonbuild/backend/ninjabackend.py | |
| parent | 979eaa804aaced2823f446242eaecd043d33521a (diff) | |
| parent | ea6e9298fa585244112e4519513690c52959039e (diff) | |
| download | meson-f6f07840388db4aa5800ac4b69211c8b2cb87a70.zip meson-f6f07840388db4aa5800ac4b69211c8b2cb87a70.tar.gz meson-f6f07840388db4aa5800ac4b69211c8b2cb87a70.tar.bz2 | |
Merge pull request #2976 from dzabraev/fix-reversed-order
Fix bug include_directories(['p1','p2']) add -Ip2 -Ip1 (reversed order)
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 39e4ce9..bfac4c7 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2169,7 +2169,10 @@ rule FORTRAN_DEP_HACK # Hence, we must reverse the list so that the order is preserved. for i in reversed(target.get_include_dirs()): basedir = i.get_curdir() - for d in i.get_incdirs(): + # We should iterate include dirs in reversed orders because + # -Ipath will add to begin of array. And without reverse + # flags will be added in reversed order. + for d in reversed(i.get_incdirs()): # Avoid superfluous '/.' at the end of paths when d is '.' if d not in ('', '.'): expdir = os.path.join(basedir, d) |