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/state_trackers/clover | |
| 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/state_trackers/clover')
| -rw-r--r-- | src/gallium/state_trackers/clover/meson.build | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build index 8f751cbb414..2ff060bf35b 100644 --- a/src/gallium/state_trackers/clover/meson.build +++ b/src/gallium/state_trackers/clover/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017-2019 Intel Corporation +# Copyright © 2017-2018 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -25,12 +25,6 @@ if with_opencl_icd clover_cpp_args += '-DHAVE_CLOVER_ICD' endif -if meson.version().version_compare('>=0.51') - _clang_resources = join_paths(dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool : 'libdir'), 'clang', dep_llvm.version(), 'include') -else - _clang_resources = join_paths(dep_llvm.get_configtool_variable('libdir'), 'clang', dep_llvm.version(), 'include') -endif - libclllvm = static_library( 'clllvm', files( @@ -49,7 +43,10 @@ libclllvm = static_library( cpp_vis_args, '-DLIBCLC_INCLUDEDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('includedir')), '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), - '-DCLANG_RESOURCE_DIR="@0@"'.format(_clang_resources), + '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( + dep_llvm.get_configtool_variable('libdir'), 'clang', + dep_llvm.version(), 'include', + )), ], dependencies : [dep_llvm, dep_elf], override_options : clover_cpp_std, |