From aa27dd7928da74b92ebe0e420d040ef6be3766b6 Mon Sep 17 00:00:00 2001 From: Matthias Klumpp Date: Mon, 15 Oct 2018 18:27:55 +0200 Subject: [PATCH] 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. --- mesonbuild/backend/ninjabackend.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 6b2a00a19..b5643110b 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 = []