diff options
| author | Dylan Baker <[email protected]> | 2019-06-28 16:36:38 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-06-28 16:36:38 -0700 |
| commit | 97c2c4546ca5d7c17f039dde9a6fd5957fb2364a (patch) | |
| tree | 08b051f00a8a094f7c4145b33a311ef0dbae68b2 /src/gallium/targets/opencl | |
| parent | 69f9fbab8a92a2bb797723f28fe8dad5cd8c8a64 (diff) | |
Revert "meson: Add support for using cmake for finding LLVM"
This reverts commit 5157a4276500c77e2210e853b262be1d1b30aedf.
There is a meson bug that causes llvm to always be statically linked,
which is obviously not what we want. I haven't had time to look into it
yet, but for now let's just revert it.
Diffstat (limited to 'src/gallium/targets/opencl')
| -rw-r--r-- | src/gallium/targets/opencl/meson.build | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 676e0e13174..317ad8dab4a 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -29,11 +29,7 @@ if with_ld_version_script opencl_link_deps += files('opencl.sym') endif -if meson.version().version_compare('>=0.51') - llvm_libdir = dep_llvm.get_variable(configtool : 'libdir', cmake : 'LLVM_LIBRARY_DIR') -else - llvm_libdir = dep_llvm.get_configtool_variable('libdir') -endif +llvm_libdir = dep_llvm.get_configtool_variable('libdir') opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' |