Fix compile.links for vala (alternative)

Fixes issue #12959 compiler.links command for vala crashes Add a new enumerated typei (FORCELINK) to CompileCheckMode.
mesonbuild · Apr 22, 2024 · 2d09edd · 2d09edd
1 parent e166524
commit 2d09edd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
@@ -181,6 +181,7 @@ class CompileCheckMode(enum.Enum):
     PREPROCESS = 'preprocess'
     COMPILE = 'compile'
     LINK = 'link'
+    FORCELINK = 'forcelink'
 
 
 gnu_winlibs = ['-lkernel32', '-luser32', '-lgdi32', '-lwinspool', '-lshell32',

diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
@@ -29,7 +29,6 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
         super().__init__([], exelist, version, for_machine, info, is_cross=is_cross)
         self.version = version
         self.base_options = {OptionKey('b_colorout')}
-        self.force_link = False
 
     def needs_static_linker(self) -> bool:
         return False # Because compiles into C.
@@ -48,15 +47,13 @@ def get_compile_only_args(self) -> T.List[str]:
 
     def get_compiler_args_for_mode(self, mode: CompileCheckMode) -> T.List[str]:
         args: T.List[str] = []
-        if mode is CompileCheckMode.LINK and self.force_link:
+        if mode is CompileCheckMode.FORCELINK:
             return args
         args += self.get_always_args()
         if mode is CompileCheckMode.COMPILE:
             args += self.get_compile_only_args()
         elif mode is CompileCheckMode.PREPROCESS:
             args += self.get_preprocess_only_args()
-        else:
-            assert mode is CompileCheckMode.LINK
         return args
 
     def get_preprocess_only_args(self) -> T.List[str]:
@@ -153,11 +150,8 @@ def links(self, code: 'mesonlib.FileOrString', env: 'Environment', *,
         if compiler:
             with compiler._build_wrapper(code, env, dependencies=dependencies, want_output=True) as r:
                 objfile = mesonlib.File.from_absolute_file(r.output_name)
-                result = self.compiles(objfile, env, extra_args=extra_args,
-                                       dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=True)
-                self.force_link = False
-                return result
-        result = self.compiles(code, env, extra_args=extra_args,
-                               dependencies=dependencies, mode=CompileCheckMode.LINK, disable_cache=disable_cache)
-        self.force_link = False
-        return result
+                return self.compiles(objfile, env, extra_args=extra_args,
+                                     dependencies=dependencies, mode=CompileCheckMode.FORCELINK, disable_cache=True)
+        return self.compiles(code, env, extra_args=extra_args,
+                             dependencies=dependencies, mode=CompileCheckMode.FORCELINK, disable_cache=disable_cache)
+