mesa: Match rtti settings with the libllvm dependency (#31145)

* llvm-amdgpu: Update the libllvm version provided

* mesa: Match configure rtti settings to the libllvm dependency

2 files changed, 11 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
index ec9fafca8f..5b321bc028 100644
--- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
+++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
@@ -54,7 +54,8 @@ class LlvmAmdgpu(CMakePackage):
 
     provides('libllvm@11', when='@3.5:3.8')
     provides('libllvm@12', when='@3.9:4.2')
-    provides('libllvm@13', when='@4.3:')
+    provides('libllvm@13', when='@4.3:4.9')
+    provides('libllvm@14', when='@5:')
 
     depends_on('cmake@3.4.3:',  type='build', when='@:3.8')
     depends_on('cmake@3.13.4:', type='build', when='@3.9.0:')
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index 4d90b55a04..4a94189fba 100644
--- a/var/spack/repos/builtin/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
@@ -204,6 +204,7 @@ class Mesa(MesonPackage):
         args.append(opt_enable(num_frontends > 1, 'shared-glapi'))
 
         if '+llvm' in spec:
+            llvm_config = Executable(spec['libllvm'].prefix.bin.join('llvm-config'))
             # Fix builds on hosts where /usr/bin/llvm-config-* is found and provides an
             # incompatible version. Ensure that the llvm-config of spec['libllvm'] is
             # used.
@@ -212,12 +213,18 @@ class Mesa(MesonPackage):
             mkdirp(self.build_directory)
             with working_dir(self.build_directory):
                 with open('meson-native-config.ini', 'w') as native_config:
-                    llvm_config = spec['libllvm'].prefix.bin + '/llvm-config'
                     native_config.write('[binaries]\n')
-                    native_config.write("llvm-config = '{0}'\n".format(llvm_config))
+                    native_config.write(
+                        "llvm-config = '{0}'\n".format(llvm_config.path))
             args.append('-Dllvm=enabled')
             args.append(opt_enable(
                 '+llvm_dylib' in spec['libllvm'], 'shared-llvm'))
+
+            # Match the llvm rtti setting
+            if llvm_config('--has-rtti', error=str, output=str).strip() == 'YES':
+                args.append('-Dcpp_rtti=true')
+            else:
+                args.append('-Dcpp_rtti=false')
         else:
             args.append('-Dllvm=disabled')