mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 10:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: Add support for wrapping llvm

Browse Source 
For building on Windows (when not using cygwin), users may want to use a
binary wrap of LLVM, this provides a fallback to the LLVM dependency
which may be used in this case

Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Dylan Baker 2018-04-24 13:48:25 -07:00
parent dbd554ba05
commit b962c7c971
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meson.build
View File

@ -1384,6 +1384,7 @@ if _llvm != 'false'
),
static : not _shared_llvm,
method : 'config-tool',
fallback : ['llvm', 'dep_llvm'],
)
with_llvm = dep_llvm.found()
endif
@ -1394,7 +1395,19 @@ 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.
if dep_llvm.get_configtool_variable('has-rtti') == 'NO'
#
# 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 dep_llvm.type_name() == 'internal'
_rtti = subproject('llvm').get_variable('has_rtti', true)
elif 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 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

16
src/gallium/drivers/swr/rasterizer/jitter/meson.build
View File

@ -18,15 +18,21 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
if dep_llvm.type_name() == 'internal'
_irbuilder_h = subproject('llvm').get_variable('irbuilder_h')
else
if meson.version().version_compare('>=0.51')
_llvm_includedir = dep_llvm.get_variable(configtool : 'includedir', cmake : 'LLVM_INCLUDE_DIR')
else
_llvm_includedir = dep_llvm.get_configtool_variable('includedir')
endif
_irbuilder_h = join_paths(_llvm_includedir, 'llvm', 'IR', 'IRBuilder.h')
endif
gen_builder_hpp = custom_target(
'gen_builder.hpp',
input : [
swr_gen_llvm_ir_macros_py,
join_paths(
dep_llvm.get_configtool_variable('includedir'), 'llvm', 'IR',
'IRBuilder.h'
)
swr_gen_llvm_ir_macros_py, _irbuilder_h,
],
output : 'gen_builder.hpp',
command : [