From d0325c898ad7f16dc9e22389d365a33097b80af8 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sat, 1 May 2021 15:15:00 +0200 Subject: Use sanity_check_impl for objc/objpp This gets rid of compile warnings, and simplifies the code. Note that `work_dir` in sanity_check_impl was incorrect, it was used both to prepend to file names and as cwd=work_dir argument to Popen. This is fixed here. Closes gh-7344 --- mesonbuild/compilers/objc.py | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'mesonbuild/compilers/objc.py') diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py index ce9cf2d..7d19e52 100644 --- a/mesonbuild/compilers/objc.py +++ b/mesonbuild/compilers/objc.py @@ -48,29 +48,8 @@ class ObjCCompiler(CLikeCompiler, Compiler): return 'Objective-C' def sanity_check(self, work_dir: str, environment: 'Environment') -> None: - # TODO try to use sanity_check_impl instead of duplicated code - source_name = os.path.join(work_dir, 'sanitycheckobjc.m') - binary_name = os.path.join(work_dir, 'sanitycheckobjc') - extra_flags: T.List[str] = [] - extra_flags += environment.coredata.get_external_args(self.for_machine, self.language) - if self.is_cross: - extra_flags += self.get_compile_only_args() - else: - extra_flags += environment.coredata.get_external_link_args(self.for_machine, self.language) - with open(source_name, 'w') as ofile: - ofile.write('#import\n' - 'int main(void) { return 0; }\n') - pc = subprocess.Popen(self.exelist + extra_flags + [source_name, '-o', binary_name]) - pc.wait() - if pc.returncode != 0: - raise EnvironmentException('ObjC compiler %s can not compile programs.' % self.name_string()) - if self.is_cross: - # Can't check if the binaries run so we have to assume they do - return - pe = subprocess.Popen(binary_name) - pe.wait() - if pe.returncode != 0: - raise EnvironmentException('Executables created by ObjC compiler %s are not runnable.' % self.name_string()) + code = '#import\nint main(void) { return 0; }\n' + return self._sanity_check_impl(work_dir, environment, 'sanitycheckobjc.m', code) class GnuObjCCompiler(GnuCompiler, ObjCCompiler): -- cgit v1.1