diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-30 16:16:08 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-01-31 15:43:04 +0100 |
| commit | 8224ecfbe6e1811680113740341a277407904eb9 (patch) | |
| tree | ba7bb8e00f088cf7b60970485d88d2c7bb895749 /mesonbuild/ast/interpreter.py | |
| parent | 4bfe0a25681f1abb8710aba1a89220dc328ee589 (diff) | |
| download | meson-8224ecfbe6e1811680113740341a277407904eb9.zip meson-8224ecfbe6e1811680113740341a277407904eb9.tar.gz meson-8224ecfbe6e1811680113740341a277407904eb9.tar.bz2 | |
Some fixes and assignment based target find
Diffstat (limited to 'mesonbuild/ast/interpreter.py')
| -rw-r--r-- | mesonbuild/ast/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/ast/interpreter.py b/mesonbuild/ast/interpreter.py index 2071432..b527e37 100644 --- a/mesonbuild/ast/interpreter.py +++ b/mesonbuild/ast/interpreter.py @@ -103,7 +103,7 @@ class AstInterpreter(interpreterbase.InterpreterBase): prev_subdir = self.subdir subdir = os.path.join(prev_subdir, args[0]) absdir = os.path.join(self.source_root, subdir) - buildfilename = os.path.join(self.subdir, environment.build_filename) + buildfilename = os.path.join(subdir, environment.build_filename) absname = os.path.join(self.source_root, buildfilename) symlinkless_dir = os.path.realpath(absdir) if symlinkless_dir in self.visited_subdirs: @@ -118,7 +118,7 @@ class AstInterpreter(interpreterbase.InterpreterBase): code = f.read() assert(isinstance(code, str)) try: - codeblock = mparser.Parser(code, self.subdir).parse() + codeblock = mparser.Parser(code, subdir).parse() except mesonlib.MesonException as me: me.file = buildfilename raise me |