Merge main, resolve conflicts with vala

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/compilers/hook.ts b/lib/compilers/hook.ts
index c731cc530..14eb27b8d 100644
--- a/lib/compilers/hook.ts
+++ b/lib/compilers/hook.ts
@@ -64,7 +64,7 @@ export class HookCompiler extends BaseCompiler {
         compiler: string,
         options: string[],
         inputFilename: string,
-        execOptions: ExecutionOptions,
+        execOptions: ExecutionOptions & {env: Record<string, string>},
     ): Promise<CompilationResult> {
         const dirPath = path.dirname(inputFilename);
         const outputFilename = this.getOutputFilename(dirPath);
@@ -72,10 +72,10 @@ export class HookCompiler extends BaseCompiler {
         return super.runCompiler(compiler, options, inputFilename, execOptions);
     }
 
-    override processAsm(result, filters, options) {
+    override async processAsm(result, filters, options) {
         // Ignoring `trim` filter because it is not supported by Hook.
         filters.trim = false;
-        const _result = super.processAsm(result, filters, options);
+        const _result = await super.processAsm(result, filters, options);
         const commentRegex = /^\s*;(.*)/;
         const instructionRegex = /^\s{2}(\d+)(.*)/;
         const asm = _result.asm;