diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-25 18:55:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 18:55:47 +0200 |
| commit | d668bea11dbc7140459ad8f9e326cbe0aa1e738f (patch) | |
| tree | 23391a9d61ee061eae7cbc8b76c66d412472c19d /mesonbuild/backend/ninjabackend.py | |
| parent | aeb694d9c379fbf7c4d01c3848e6441d690ce492 (diff) | |
| parent | b35a808972a4a51438e0c76f117c557fe3a1ffa1 (diff) | |
| download | meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.zip meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.tar.gz meson-d668bea11dbc7140459ad8f9e326cbe0aa1e738f.tar.bz2 | |
Merge pull request #1496 from centricular/fix-internal-dep-order
Preserve internal-dep include order in build target dependencies
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index ede0ef7..a167c46 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1822,10 +1822,12 @@ rule FORTRAN_DEP_HACK # and from `include_directories:` of internal deps of the target. # # Target include dirs should override internal deps include dirs. + # This is handled in BuildTarget.process_kwargs() # # Include dirs from internal deps should override include dirs from - # external deps. - for i in target.get_include_dirs(): + # external deps and must maintain the order in which they are specified. + # 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(): # Avoid superfluous '/.' at the end of paths when d is '.' |