diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-06 15:17:32 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-10-06 15:17:32 +0300 |
commit | 3acab5dcb59a777b2713e0ca921f6a562deef1b3 (patch) | |
tree | 86281e6a411142e253fa4914a945da9396cb4b2b | |
parent | 5bbea6be05c9740aedcd7f170c24a6b2c098cd01 (diff) | |
download | meson-crosscheck.tar.gz |
Cross build is defined by the existance of a cross file.crosscheck
-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 c7fbf540b..3b9e3e93b 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 e5d041b48..03c65688f 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()) |