diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-10-20 09:13:59 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-10-24 11:06:57 +0200 |
| commit | 4f4076bfc0dacbc5f804ad2d970054ab43d162b3 (patch) | |
| tree | 868868b7bf1bbda02eaa20db88d8930c5a3ce32c /test cases | |
| parent | eb731cda758b5d0e2c83d934714b4e7a2656e805 (diff) | |
| download | meson-4f4076bfc0dacbc5f804ad2d970054ab43d162b3.tar.gz | |
nasm: Harcode default path on Windows
NASM's installer does not add itself into PATH, even when installed by
choco.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/nasm/2 asm language/meson.build | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/test cases/nasm/2 asm language/meson.build b/test cases/nasm/2 asm language/meson.build index ced2ded62..e1ef10a76 100644 --- a/test cases/nasm/2 asm language/meson.build +++ b/test cases/nasm/2 asm language/meson.build @@ -1,18 +1,15 @@ project('test', 'c') -nasm = find_program('nasm', required: false) -yasm = find_program('yasm', required: false) -if not nasm.found() and not yasm.found() - assert(not add_languages('nasm', required: false)) - error('MESON_SKIP_TEST: nasm not available') -endif - if not host_machine.cpu_family().startswith('x86') assert(not add_languages('nasm', required: false)) error('MESON_SKIP_TEST: nasm only supported for x86 and x86_64') endif -add_languages('nasm') +if not add_languages('nasm', required: false) + nasm = find_program('nasm', 'yasm', required: false) + assert(not nasm.found()) + error('MESON_SKIP_TEST: nasm not found') +endif config_file = configure_file( output: 'config.asm', |