diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-13 09:54:10 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | eb8ae929d97a060dac28b4a339e7c1df8d3118c8 (patch) | |
| tree | fbdd583223488584e3ac2956f68b5e119b858d93 /mesonbuild/dependencies | |
| parent | 2768f41817732b1f6484bc6fec3dfdaf70dcc485 (diff) | |
| download | meson-eb8ae929d97a060dac28b4a339e7c1df8d3118c8.tar.gz | |
compilers: Remove Environment parameter from Compiler.get_define
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index c5b78c9a5..4d219a589 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -549,7 +549,7 @@ class ZlibSystemDependency(SystemDependency): else: return - v, _ = self.clib_compiler.get_define('ZLIB_VERSION', '#include <zlib.h>', self.env, [], [self]) + v, _ = self.clib_compiler.get_define('ZLIB_VERSION', '#include <zlib.h>', [], [self]) self.version = v.strip('"') @@ -745,7 +745,7 @@ class DiaSDKSystemDependency(SystemDependency): # Check if compiler has a built-in macro defined @staticmethod def _has_define(compiler: 'Compiler', dname: str, env: 'Environment') -> bool: - defval, _ = compiler.get_define(dname, '', env, [], []) + defval, _ = compiler.get_define(dname, '', [], []) return defval is not None def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs) -> None: diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index a0301bef9..b1b8b8e13 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -140,7 +140,7 @@ class OpenMPDependency(SystemDependency): try: openmp_date = self.clib_compiler.get_define( - '_OPENMP', '', self.env, [], [self], disable_cache=True)[0] + '_OPENMP', '', [], [self], disable_cache=True)[0] except mesonlib.EnvironmentException as e: mlog.debug('OpenMP support not available in the compiler') mlog.debug(e) @@ -383,11 +383,11 @@ class CursesSystemDependency(SystemDependency): # implementations. The one in illumos/OpenIndiana # doesn't seem to have a version defined in the header. if lib.startswith('ncurses'): - v, _ = self.clib_compiler.get_define('NCURSES_VERSION', f'#include <{header}>', env, [], [self]) + v, _ = self.clib_compiler.get_define('NCURSES_VERSION', f'#include <{header}>', [], [self]) self.version = v.strip('"') if lib.startswith('pdcurses'): - v_major, _ = self.clib_compiler.get_define('PDC_VER_MAJOR', f'#include <{header}>', env, [], [self]) - v_minor, _ = self.clib_compiler.get_define('PDC_VER_MINOR', f'#include <{header}>', env, [], [self]) + v_major, _ = self.clib_compiler.get_define('PDC_VER_MAJOR', f'#include <{header}>', [], [self]) + v_minor, _ = self.clib_compiler.get_define('PDC_VER_MINOR', f'#include <{header}>', [], [self]) self.version = f'{v_major}.{v_minor}' # Check the version if possible, emit a warning if we can't @@ -466,10 +466,10 @@ class OpensslSystemDependency(SystemDependency): return # openssl >= 3 only - self.version = self.clib_compiler.get_define('OPENSSL_VERSION_STR', '#include <openssl/opensslv.h>', env, [], [self])[0] + self.version = self.clib_compiler.get_define('OPENSSL_VERSION_STR', '#include <openssl/opensslv.h>', [], [self])[0] # openssl < 3 only if not self.version: - version_hex = self.clib_compiler.get_define('OPENSSL_VERSION_NUMBER', '#include <openssl/opensslv.h>', env, [], [self])[0] + version_hex = self.clib_compiler.get_define('OPENSSL_VERSION_NUMBER', '#include <openssl/opensslv.h>', [], [self])[0] if not version_hex: return version_hex = version_hex.rstrip('L') |