Purge `is_cross` and friends without changing user interfaces

In most cases instead pass `for_machine`, the name of the relevant
machines (what compilers target, what targets run on, etc). This allows
us to use the cross code path in the native case, deduplicating the
code.

As one can see, environment got bigger as more information is kept
structured there, while ninjabackend got a smaller. Overall a few amount
of lines were added, but the hope is what's added is a lot simpler than
what's removed.

1 files changed, 10 insertions, 14 deletions

diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index ef08fdb..86a7f83 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -27,7 +27,7 @@ from .. import mlog
 from .. import compilers
 from ..compilers import CompilerArgs
 from ..mesonlib import (
-    MesonException, MachineChoice, File, python_command, replace_if_different
+    MesonException, File, python_command, replace_if_different
 )
 from ..environment import Environment, build_filename
 
@@ -720,7 +720,7 @@ class Vs2010Backend(backends.Backend):
         # No source files, only objects, but we still need a compiler, so
         # return a found compiler
         if len(target.objects) > 0:
-            for lang, c in self.environment.coredata.compilers.items():
+            for lang, c in self.environment.coredata.compilers[target.for_machine].items():
                 if lang in ('c', 'cpp'):
                     return c
         raise MesonException('Could not find a C or C++ compiler. MSVC can only build C/C++ projects.')
@@ -883,27 +883,23 @@ class Vs2010Backend(backends.Backend):
         file_inc_dirs = dict((lang, []) for lang in target.compilers)
         # The order in which these compile args are added must match
         # generate_single_compile() and generate_basic_compiler_args()
-        if self.environment.is_cross_build() and not target.is_cross:
-            for_machine = MachineChoice.BUILD
-        else:
-            for_machine = MachineChoice.HOST
         for l, comp in target.compilers.items():
             if l in file_args:
                 file_args[l] += compilers.get_base_compile_args(self.get_base_options_for_target(target), comp)
-                file_args[l] += comp.get_option_compile_args(self.environment.coredata.compiler_options[for_machine])
+                file_args[l] += comp.get_option_compile_args(self.environment.coredata.compiler_options[target.for_machine])
 
         # Add compile args added using add_project_arguments()
-        for l, args in self.build.projects_args.get(target.subproject, {}).items():
+        for l, args in self.build.projects_args[target.for_machine].get(target.subproject, {}).items():
             if l in file_args:
                 file_args[l] += args
         # Add compile args added using add_global_arguments()
         # These override per-project arguments
-        for l, args in self.build.global_args.items():
+        for l, args in self.build.global_args[target.for_machine].items():
             if l in file_args:
                 file_args[l] += args
         # Compile args added from the env or cross file: CFLAGS/CXXFLAGS, etc. We want these
         # to override all the defaults, but not the per-target compile args.
-        for key, opt in self.environment.coredata.compiler_options[for_machine].items():
+        for key, opt in self.environment.coredata.compiler_options[target.for_machine].items():
             l, suffix = key.split('_', 1)
             if suffix == 'args' and l in file_args:
                 file_args[l] += opt.value
@@ -1083,14 +1079,14 @@ class Vs2010Backend(backends.Backend):
                 options = self.environment.coredata.base_options
                 extra_link_args += compiler.get_std_shared_module_link_args(options)
             # Add link args added using add_project_link_arguments()
-            extra_link_args += self.build.get_project_link_args(compiler, target.subproject, target.is_cross)
+            extra_link_args += self.build.get_project_link_args(compiler, target.subproject, target.for_machine)
             # Add link args added using add_global_link_arguments()
             # These override per-project link arguments
-            extra_link_args += self.build.get_global_link_args(compiler, target.is_cross)
+            extra_link_args += self.build.get_global_link_args(compiler, target.for_machine)
             # Link args added from the env: LDFLAGS, or the cross file. We want
             # these to override all the defaults but not the per-target link
             # args.
-            extra_link_args += self.environment.coredata.get_external_link_args(for_machine, compiler.get_language())
+            extra_link_args += self.environment.coredata.get_external_link_args(target.for_machine, compiler.get_language())
             # Only non-static built targets need link args and link dependencies
             extra_link_args += target.link_args
             # External deps must be last because target link libraries may depend on them.
@@ -1113,7 +1109,7 @@ class Vs2010Backend(backends.Backend):
         # to be after all internal and external libraries so that unresolved
         # symbols from those can be found here. This is needed when the
         # *_winlibs that we want to link to are static mingw64 libraries.
-        extra_link_args += compiler.get_option_link_args(self.environment.coredata.compiler_options[for_machine])
+        extra_link_args += compiler.get_option_link_args(self.environment.coredata.compiler_options[compiler.for_machine])
         (additional_libpaths, additional_links, extra_link_args) = self.split_link_args(extra_link_args.to_native())
 
         # Add more libraries to be linked if needed