diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-03-11 12:06:05 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-04-17 22:02:41 +0000 |
| commit | f798207a9a2ef726ee67cf5ddfd56e723745bbf2 (patch) | |
| tree | 3904e50beb8229d77a805213a9df4e1057cc9817 /mesonbuild/interpreter.py | |
| parent | cf4b9e650226892079759bc8f40241f2cec44d09 (diff) | |
| download | meson-f798207a9a2ef726ee67cf5ddfd56e723745bbf2.zip meson-f798207a9a2ef726ee67cf5ddfd56e723745bbf2.tar.gz meson-f798207a9a2ef726ee67cf5ddfd56e723745bbf2.tar.bz2 | |
interpreter: Correctly ignore def files in build directory
See https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/85.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index c1636d7..214b1eb 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2422,14 +2422,14 @@ class Interpreter(InterpreterBase): return f = os.path.normpath(f.relative_name()) elif os.path.isfile(f) and not f.startswith('/dev'): - srcdir = self.environment.get_source_dir() - builddir = self.environment.get_build_dir() - f = os.path.normpath(f) - rel_path = mesonlib.relpath(f, start=srcdir) - if not rel_path.startswith('..'): - f = rel_path - elif not mesonlib.relpath(f, start=builddir).startswith('..'): + srcdir = Path(self.environment.get_source_dir()) + builddir = Path(self.environment.get_build_dir()) + f = Path(f).resolve() + if builddir in f.parents: return + if srcdir in f.parents: + f = f.relative_to(srcdir) + f = str(f) else: return if f not in self.build_def_files: |