diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-06 15:17:32 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-06 17:46:16 +0300 |
| commit | 0b4d1e8afd5428a495f8624ee061f63977b4c268 (patch) | |
| tree | e64fa4bd6c384e8db61ccd845b6b5653dbac80e8 | |
| parent | 51fef880b6a12e82955d5b93df7ffed0ae2f1478 (diff) | |
| download | meson-0b4d1e8afd5428a495f8624ee061f63977b4c268.zip meson-0b4d1e8afd5428a495f8624ee061f63977b4c268.tar.gz meson-0b4d1e8afd5428a495f8624ee061f63977b4c268.tar.bz2 | |
Cross build is defined by the existance of a cross file.
| -rw-r--r-- | mesonbuild/coredata.py | 2 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index c7fbf54..3b9e3e9 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -636,7 +636,7 @@ class CoreData: if type(oldval) != type(value): self.user_options[name] = value - def is_cross_build(self): + def is_cross_build(self) -> bool: return len(self.cross_files) > 0 def strip_build_option_names(self, options): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index e5d041b..03c6568 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -611,7 +611,7 @@ class Environment: self.first_invocation = True def is_cross_build(self) -> bool: - return not self.machines.matches_build_machine(MachineChoice.HOST) + return self.coredata.is_cross_build() def dump_coredata(self): return coredata.save(self.coredata, self.get_build_dir()) |