Module: Mesa Branch: master Commit: 1d01b52d761227c9675b2785cc242ec51e803e84 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d01b52d761227c9675b2785cc242ec51e803e84
Author: Dylan Baker <dy...@pnwbakers.com> Date: Tue Apr 24 14:15:47 2018 -0700 meson: Fix no-rtti in llvm detection Because I clearly wasn't thinking and clearly didn't do a good job testing. Sigh Fixes: c5a97d658ec19cc02719d7f86c1b0715e3d9ffc4 ("meson: fix builds against LLVM built without rtti") Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com> Reviewed-by: Marek Olšák <marek.ol...@amd.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 590ac40a78..52a1075823 100644 --- a/meson.build +++ b/meson.build @@ -1149,7 +1149,7 @@ if with_llvm # 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' - cpp_args('-fno-rtti') + cpp_args += '-fno-rtti' endif 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.') _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit