diff --git a/mesonbuild/compilers/asm.py b/mesonbuild/compilers/asm.py index 4b734cf29..1689b3283 100644 --- a/mesonbuild/compilers/asm.py +++ b/mesonbuild/compilers/asm.py @@ -76,7 +76,13 @@ class NasmCompiler(ASMCompiler): return True def get_always_args(self) -> T.List[str]: - cpu = '64' if self.info.is_64_bit else '32' + if self.info.is_64_bit: + if self.info.cpu == 'x32': + cpu = 'x32' + else: + cpu = '64' + else: + cpu = '32' if self.info.is_windows() or self.info.is_cygwin(): plat = 'win' define = f'WIN{cpu}' diff --git a/test cases/nasm/1 configure file/meson.build b/test cases/nasm/1 configure file/meson.build index 46a704ceb..0abd15853 100644 --- a/test cases/nasm/1 configure file/meson.build +++ b/test cases/nasm/1 configure file/meson.build @@ -10,6 +10,8 @@ endif if host_machine.cpu_family() == 'x86' asm_format = 'elf32' +elif host_machine.cpu() == 'x32' + asm_format = 'elfx32' else asm_format = 'elf64' endif