diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-20 20:35:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 20:35:59 +0200 |
| commit | 84e216fd64028b175eee93783da6d54dadae09e2 (patch) | |
| tree | 35e53948973bbe5711cf329b6535df7b1c26cff8 /mesonbuild/interpreter.py | |
| parent | e781dfcb2b668607925188a4bc58b76f190107e5 (diff) | |
| parent | 2cf2c80112ae16e8b465cdfb91d85b7d031e67fa (diff) | |
| download | meson-84e216fd64028b175eee93783da6d54dadae09e2.zip meson-84e216fd64028b175eee93783da6d54dadae09e2.tar.gz meson-84e216fd64028b175eee93783da6d54dadae09e2.tar.bz2 | |
Merge pull request #6636 from jon-turney/machine-detection-problems
Redetect machines when languages change
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 2bd5992..eb3c5fe 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2255,7 +2255,9 @@ class Interpreter(InterpreterBase): self.build_def_files = [os.path.join(self.subdir, environment.build_filename)] if not mock: self.parse_project() + self._redetect_machines() + def _redetect_machines(self): # Re-initialize machine descriptions. We can do a better job now because we # have the compilers needed to gain more knowledge, so wipe out old # inference and start over. @@ -3075,6 +3077,7 @@ external dependencies (including libraries) must go to "dependencies".''') success = self.add_languages_for(args, required, for_machine) if not self.coredata.is_cross_build(): self.coredata.copy_build_options_from_regular_ones() + self._redetect_machines() return success def add_languages_for(self, args, required, for_machine: MachineChoice): |