summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/d.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-10-31 10:24:23 -0700
committerDylan Baker <dylan@pnwbakers.com>2025-11-19 10:48:48 -0800
commita6c4a4d7e867db4f98db1127d1246c43c5c7a863 (patch)
treebd70a8701333f1238fa2b8c99e3a818dd82ab949 /mesonbuild/compilers/d.py
parent12b1e3c6a72b715bf20e4c304da065e16c510830 (diff)
downloadmeson-a6c4a4d7e867db4f98db1127d1246c43c5c7a863.tar.gz
compilers: Pass Environment instead of MachineInfo
We end up needing it everywhere, so just store it. This patch is huge already, so it's just the conversion to passing Environment, more cleanups to come.
Diffstat (limited to 'mesonbuild/compilers/d.py')
-rw-r--r--mesonbuild/compilers/d.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index 9f662add3..c37bb679a 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -430,11 +430,11 @@ class DCompiler(Compiler):
language = 'd'
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- info: 'MachineInfo', arch: str, *,
+ env: Environment, arch: str, *,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None,
is_cross: bool = False):
- super().__init__([], exelist, version, for_machine, info, linker=linker,
+ super().__init__([], exelist, version, for_machine, env, linker=linker,
full_version=full_version, is_cross=is_cross)
self.arch = arch
@@ -639,11 +639,11 @@ class GnuDCompiler(GnuCompiler, DCompiler):
id = 'gcc'
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- info: 'MachineInfo', arch: str, *,
+ env: Environment, arch: str, *,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None,
is_cross: bool = False):
- DCompiler.__init__(self, exelist, version, for_machine, info, arch,
+ DCompiler.__init__(self, exelist, version, for_machine, env, arch,
linker=linker,
full_version=full_version, is_cross=is_cross)
GnuCompiler.__init__(self, {})
@@ -722,11 +722,11 @@ class LLVMDCompiler(DmdLikeCompilerMixin, DCompiler):
id = 'llvm'
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- info: 'MachineInfo', arch: str, *,
+ env: Environment, arch: str, *,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None,
is_cross: bool = False, version_output: T.Optional[str] = None):
- DCompiler.__init__(self, exelist, version, for_machine, info, arch,
+ DCompiler.__init__(self, exelist, version, for_machine, env, arch,
linker=linker,
full_version=full_version, is_cross=is_cross)
DmdLikeCompilerMixin.__init__(self, dmd_frontend_version=find_ldc_dmd_frontend_version(version_output))
@@ -785,11 +785,11 @@ class DmdDCompiler(DmdLikeCompilerMixin, DCompiler):
id = 'dmd'
def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
- info: 'MachineInfo', arch: str, *,
+ env: Environment, arch: str, *,
linker: T.Optional['DynamicLinker'] = None,
full_version: T.Optional[str] = None,
is_cross: bool = False):
- DCompiler.__init__(self, exelist, version, for_machine, info, arch,
+ DCompiler.__init__(self, exelist, version, for_machine, env, arch,
linker=linker,
full_version=full_version, is_cross=is_cross)
DmdLikeCompilerMixin.__init__(self, version)