meson: Fix no-rtti in llvm detection
authorDylan Baker <dylan@pnwbakers.com>
Tue, 24 Apr 2018 21:15:47 +0000 (14:15 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Tue, 24 Apr 2018 22:26:51 +0000 (15:26 -0700)
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@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
meson.build

index 590ac40a781ee67562aaaa9f3e83d9ee72f8d6f7..52a1075823fc76e2991ee5b2b7a5e988e00ef778 100644 (file)
@@ -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.')