aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2023-02-14 12:15:40 +0000
committerNirbheek Chauhan <nirbheek@centricular.com>2023-02-19 02:55:58 +0530
commit4c9483c6d40f144a23480ef10f5cabf05052fdb7 (patch)
tree476fbc6c6747f7ac109f133dc118a7d6fbbf6dad
parent42cbc5d0344394267f8104abd9971fd9bcf98a80 (diff)
downloadmeson-4c9483c6d40f144a23480ef10f5cabf05052fdb7.zip
meson-4c9483c6d40f144a23480ef10f5cabf05052fdb7.tar.gz
meson-4c9483c6d40f144a23480ef10f5cabf05052fdb7.tar.bz2
asm: Use more backward-compatible invocation syntax for nasm
Before version 2.14.01, -MD required an output filename argument, with `-MD outfile` equivalent to later versions' `-MD -MF outfile`. The older syntax is still supported, and is still listed as the preferred syntax in documentation. Reference: https://github.com/netwide-assembler/nasm/commit/3475462e Resolves: https://github.com/mesonbuild/meson/issues/11395 Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--mesonbuild/compilers/asm.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/asm.py b/mesonbuild/compilers/asm.py
index 231cabc..9a95599 100644
--- a/mesonbuild/compilers/asm.py
+++ b/mesonbuild/compilers/asm.py
@@ -69,7 +69,7 @@ class NasmCompiler(Compiler):
return 'd'
def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
- return ['-MD', '-MQ', outtarget, '-MF', outfile]
+ return ['-MD', outfile, '-MQ', outtarget]
def sanity_check(self, work_dir: str, environment: 'Environment') -> None:
if self.info.cpu_family not in {'x86', 'x86_64'}: