Merge main, resolve conflicts with vala

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/compilers/nasm.ts b/lib/compilers/nasm.ts
index 14b4d043e..f591ff362 100644
--- a/lib/compilers/nasm.ts
+++ b/lib/compilers/nasm.ts
@@ -22,6 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import type {ConfiguredOverrides} from '../../types/compilation/compiler-overrides.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 
 import {AssemblyCompiler} from './assembly.js';
@@ -38,6 +39,7 @@ export class NasmCompiler extends AssemblyCompiler {
         inputFilename: string,
         outputFilename: string,
         libraries,
+        overrides: ConfiguredOverrides,
     ) {
         let options = super.prepareArguments(
             userOptions,
@@ -46,6 +48,7 @@ export class NasmCompiler extends AssemblyCompiler {
             inputFilename,
             outputFilename,
             libraries,
+            overrides,
         );
 
         let fmode;