diff options
| author | TheQwertiest <qwertiest@mail.ru> | 2019-04-02 12:25:47 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-02 22:46:03 +0300 |
| commit | 38273ac6684fd5b19d123427c43e851bc0b98b1b (patch) | |
| tree | 9169192e868725c7d64b3f6945cef0cde8fe55c5 | |
| parent | 75219989ca468923142738d93df8aef64e897b8e (diff) | |
| download | meson-38273ac6684fd5b19d123427c43e851bc0b98b1b.zip meson-38273ac6684fd5b19d123427c43e851bc0b98b1b.tar.gz meson-38273ac6684fd5b19d123427c43e851bc0b98b1b.tar.bz2 | |
Added deduplication for configurration time file dependencies (fixes #5190)
| -rw-r--r-- | mesonbuild/interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 3efc88c..4b713ea 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2471,7 +2471,8 @@ external dependencies (including libraries) must go to "dependencies".''') self.active_projectname = current_active self.subprojects.update(subi.subprojects) self.subprojects[dirname] = SubprojectHolder(subi, self.subproject_dir, dirname) - self.build_def_files += subi.build_def_files + # Duplicates are possible when subproject uses files from project root + self.build_def_files = list(set(self.build_def_files + subi.build_def_files)) self.build.merge(subi.build) self.build.subprojects[dirname] = subi.project_version return self.subprojects[dirname] |