diff options
| author | Matthias Klumpp <matthias@tenstral.net> | 2018-10-15 18:27:55 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-15 19:27:55 +0300 |
| commit | aa27dd7928da74b92ebe0e420d040ef6be3766b6 (patch) | |
| tree | 2cfeade4130711e269b69c288cd54e4fd3bb6220 /mesonbuild | |
| parent | 8cd3e166d8206cae49b29fd3aa20ebb9c8113dcd (diff) | |
| download | meson-aa27dd7928da74b92ebe0e420d040ef6be3766b6.zip meson-aa27dd7928da74b92ebe0e420d040ef6be3766b6.tar.gz meson-aa27dd7928da74b92ebe0e420d040ef6be3766b6.tar.bz2 | |
Regression fix: Don't try to import empty-string custom target include dirs (#4342)
* Don't try to import empty-string custom target include dirs
* Import current directory if custom target dir is empty
This restores the previous behavior and fixes test failures caused by
the previous commit.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 6b2a00a..b564311 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1944,6 +1944,8 @@ rule FORTRAN_DEP_HACK%s if not isinstance(i, (build.CustomTarget, build.CustomTargetIndex)): continue idir = self.get_target_dir(i) + if not idir: + idir = '.' if idir not in custom_target_include_dirs: custom_target_include_dirs.append(idir) incs = [] |