[Mesa-dev] [PATCH] meson: Fix no-rtti in llvm detection

Dylan Baker dylan at pnwbakers.com
Tue Apr 24 21:16:51 UTC 2018


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.baker at intel.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 590ac40a781..52a1075823f 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.')
-- 
2.17.0



More information about the mesa-dev mailing list