diff options
| -rw-r--r-- | meson.build | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meson.build b/meson.build index 0dfe09858bf..712210f0f1b 100644 --- a/meson.build +++ b/meson.build @@ -1086,14 +1086,6 @@ if dep_thread.found() and host_machine.system() != 'windows' pre_args += '-DHAVE_PTHREAD_SETAFFINITY' endif endif -if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 or with_gallium_opencl - dep_elf = dependency('libelf', required : false) - if not dep_elf.found() - dep_elf = cc.find_library('elf') - endif -else - dep_elf = null_dep -endif dep_expat = dependency('expat') # this only exists on linux so either this is linux and it will be found, or # its not linux and and wont @@ -1240,6 +1232,16 @@ elif with_amd_vk or with_gallium_radeonsi or with_gallium_swr error('The following drivers require LLVM: Radv, RadeonSI, SWR. One of these is enabled, but LLVM is disabled.') endif +if (with_amd_vk or with_gallium_radeonsi or with_gallium_opencl or + (with_gallium_r600 and with_llvm)) + dep_elf = dependency('libelf', required : false) + if not dep_elf.found() + dep_elf = cc.find_library('elf') + endif +else + dep_elf = null_dep +endif + dep_glvnd = null_dep if with_glvnd dep_glvnd = dependency('libglvnd', version : '>= 0.2.0') |