diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-11-03 09:01:33 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-11-19 10:48:48 -0800 |
| commit | 67a49deb955a6a49b8f3155065e5f6bfecba42f2 (patch) | |
| tree | 8f0a2753d2b7673587e55538723dfd2e97d92020 | |
| parent | 8938f5efad47364da9e6234660562ae5a05f1c06 (diff) | |
| download | meson-67a49deb955a6a49b8f3155065e5f6bfecba42f2.tar.gz | |
compilers: Remove environment parameter from Compiler.find_framework_paths
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/framework.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 5dc53a86a..79771d04f 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1191,7 +1191,7 @@ class Compiler(HoldableObject, metaclass=abc.ABCMeta): allow_system: bool = True) -> T.Optional[T.List[str]]: raise EnvironmentException(f'{self.id} does not support find_framework') - def find_framework_paths(self, env: 'Environment') -> T.List[str]: + def find_framework_paths(self) -> T.List[str]: raise EnvironmentException(f'{self.id} does not support find_framework_paths') def attribute_check_func(self, name: str) -> str: diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index 17da834fa..c53087467 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -1207,7 +1207,7 @@ class CLikeCompiler(Compiler): code = 'int main(void) { return 0; }\n' return self._find_library_impl(libname, env, extra_dirs, code, libtype, lib_prefix_warning, ignore_system_dirs) - def find_framework_paths(self, env: 'Environment') -> T.List[str]: + def find_framework_paths(self) -> T.List[str]: ''' These are usually /Library/Frameworks and /System/Library/Frameworks, unless you select a particular macOS SDK with the -isysroot flag. @@ -1220,7 +1220,7 @@ class CLikeCompiler(Compiler): commands = self.get_exelist(ccache=False) + ['-v', '-E', '-'] commands += self.get_always_args() # Add CFLAGS/CXXFLAGS/OBJCFLAGS/OBJCXXFLAGS from the env - commands += env.coredata.get_external_args(self.for_machine, self.language) + commands += self.environment.coredata.get_external_args(self.for_machine, self.language) mlog.debug('Finding framework path by running: ', ' '.join(commands), '\n') os_env = os.environ.copy() os_env['LC_ALL'] = 'C' diff --git a/mesonbuild/dependencies/framework.py b/mesonbuild/dependencies/framework.py index 6f87964ec..b0a26b30a 100644 --- a/mesonbuild/dependencies/framework.py +++ b/mesonbuild/dependencies/framework.py @@ -26,7 +26,7 @@ class ExtraFrameworkDependency(ExternalDependency): raise DependencyException('No C-like compilers are available') if self.system_framework_paths is None: try: - self.system_framework_paths = self.clib_compiler.find_framework_paths(self.env) + self.system_framework_paths = self.clib_compiler.find_framework_paths() except MesonException as e: if 'non-clang' in str(e): # Apple frameworks can only be found (and used) with the |