diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-08 12:27:04 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2019-06-09 13:13:20 -0400 |
| commit | 32e827dcdc451e1c5dde952cf08e4b654eac7057 (patch) | |
| tree | c6c6377ff8b45e9e50caa8100fc14333342932fa /mesonbuild/backend | |
| parent | 69005d6b1db5e0bf9cbf5b9c4bb3b5d6a346aadb (diff) | |
| download | meson-32e827dcdc451e1c5dde952cf08e4b654eac7057.zip meson-32e827dcdc451e1c5dde952cf08e4b654eac7057.tar.gz meson-32e827dcdc451e1c5dde952cf08e4b654eac7057.tar.bz2 | |
Use `env.machines.*` to avoid some `is_cross`
This is a small example of the `is_cross` removal the that abstraction
enables.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 4 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index a044ab5..6e75974 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -743,8 +743,8 @@ class Backend: exe_wrapper = self.environment.get_exe_wrapper() else: exe_wrapper = None - if mesonlib.for_windows(is_cross, self.environment) or \ - mesonlib.for_cygwin(is_cross, self.environment): + if mesonlib.for_windows(self.environment) or \ + mesonlib.for_cygwin(self.environment): extra_bdeps = [] if isinstance(exe, build.CustomTarget): extra_bdeps = exe.get_transitive_build_target_deps() diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 54fb117..c919d8f 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -665,8 +665,8 @@ int dummy; # CustomTarget command needs extra paths first. is_cross = self.environment.is_cross_build() and \ self.environment.need_exe_wrapper() - if mesonlib.for_windows(is_cross, self.environment) or \ - mesonlib.for_cygwin(is_cross, self.environment): + if mesonlib.for_windows(self.environment) or \ + mesonlib.for_cygwin(self.environment): extra_bdeps = target.get_transitive_build_target_deps() extra_paths = self.determine_windows_extra_paths(target.command[0], extra_bdeps, is_cross) |