From 97c2c4546ca5d7c17f039dde9a6fd5957fb2364a Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 28 Jun 2019 16:36:38 -0700 Subject: 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. --- meson.build | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 4e1990eb600..fd247fe00a9 100644 --- a/meson.build +++ b/meson.build @@ -1264,6 +1264,7 @@ if _llvm != 'false' with_gallium_opencl or _llvm == 'true' ), static : not _shared_llvm, + method : 'config-tool', ) with_llvm = dep_llvm.found() endif @@ -1277,17 +1278,7 @@ if with_llvm # LLVM can be built without rtti, turning off rtti changes the ABI of C++ # programs, so we need to build all C++ code in mesa without rtti as well to # ensure that linking works. - # - # In meson 0.51.0 we can use cmake to find LLVM in addittion to meson's - # builtin llvm-config based finder. A new generic variable getter method - # has also been added, so we'll use that if we can, to cover the cmake case. - if meson.version().version_compare('>=0.51') - # The CMake finder will return 'ON', the llvm-config will return 'YES' - _rtti = ['ON', 'YES'].contains(dep_llvm.get_variable(cmake : 'LLVM_ENABLE_RTTI', configtool: 'has-rtti')) - else - _rtti = dep_llvm.get_configtool_variable('has-rtti') == 'YES' - endif - if not _rtti + if dep_llvm.get_configtool_variable('has-rtti') == 'NO' if with_gallium_nouveau error('The Nouveau driver requires rtti. You either need to turn off nouveau or use an LLVM built with LLVM_ENABLE_RTTI.') elif with_gallium_opencl -- cgit v1.2.1