diff --git a/renderdoc/driver/ihv/arm/CMakeLists.txt b/renderdoc/driver/ihv/arm/CMakeLists.txt
index f3b714369..e178cb260 100644
--- a/renderdoc/driver/ihv/arm/CMakeLists.txt
+++ b/renderdoc/driver/ihv/arm/CMakeLists.txt
@@ -54,7 +54,7 @@ set_property(SOURCE ${sources}
     PROPERTY COMPILE_FLAGS "-Wno-unknown-warning-option -Wno-range-loop-construct")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set_property(SOURCE ${sources} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32")
+    set_property(SOURCE ${sources} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32 -Wno-vla-cxx-extension")
 endif()
 
 add_library(rdoc_arm OBJECT ${sources})
diff --git a/renderdoc/driver/ihv/nv/CMakeLists.txt b/renderdoc/driver/ihv/nv/CMakeLists.txt
index 7547b88a9..aa2e181ab 100644
--- a/renderdoc/driver/ihv/nv/CMakeLists.txt
+++ b/renderdoc/driver/ihv/nv/CMakeLists.txt
@@ -20,7 +20,7 @@ if(NOT ANDROID AND NOT APPLE)
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 18.9)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.0.999)
         set_property(SOURCE ${sources} ${sources_gl} ${sources_vulkan}
             APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-cast-function-type-mismatch")
     endif()