diff --git a/src/freedreno/computerator/meson.build b/src/freedreno/computerator/meson.build
index 3b779ea76a7..8bab693169a 100644
--- a/src/freedreno/computerator/meson.build
+++ b/src/freedreno/computerator/meson.build
@@ -15,10 +15,6 @@ computerator_cpp_args = cpp.get_supported_arguments([
   '-Wno-array-bounds',
 ])
 
-if meson.is_cross_build()
-  computerator_cpp_args += '-Wno-array-bounds'
-endif
-
 computerator = executable(
   'computerator',
   computerator_files,
diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build
index e67ed1176f0..533d76d2692 100644
--- a/src/freedreno/vulkan/meson.build
+++ b/src/freedreno/vulkan/meson.build
@@ -139,6 +139,7 @@ tu_cpp_args += cpp.get_supported_arguments([
   '-fno-rtti',
   '-Wno-address-of-temporary',
   '-Wno-array-bounds',
+  '-Wno-c++11-narrowing',
   '-Wno-c99-designator',
   '-Wno-class-memaccess',
   '-Wno-missing-braces',
@@ -153,17 +154,6 @@ tu_cpp_args += cpp.get_supported_arguments([
   '-Wno-vla-cxx-extension',
 ])
 
-# HACK compiler.get_supported_arguments()/has_argument() do not seem
-# to be reliable for cross builds (!?!) so just jam in some args we
-# need and hope for the best
-if meson.is_cross_build()
-  tu_cpp_args += '-Wno-array-bounds'
-  tu_cpp_args += '-Wno-c++11-narrowing'
-  tu_cpp_args += '-Wno-missing-braces'
-  tu_cpp_args += '-Wno-unused-function'
-  tu_cpp_args += '-Wno-writable-strings'
-endif
-
 libvulkan_freedreno = shared_library(
   'vulkan_freedreno',
   [libtu_files, tu_entrypoints, tu_tracepoints, freedreno_xml_header_files, sha1_h, u_format_pack_h, bvh_spv],
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index 53f3110d638..dfadcfd2d65 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -254,15 +254,6 @@ freedreno_cpp_args += cpp.get_supported_arguments([
   '-Wno-address-of-packed-member',
 ])
 
-# HACK compiler.get_supported_arguments()/has_argument() do not seem
-# to be reliable for cross builds (!?!) so just jam in some args we
-# need and hope for the best
-if meson.is_cross_build()
-  freedreno_cpp_args += '-Wno-array-bounds'
-  freedreno_cpp_args += '-Wno-c++11-narrowing'
-  freedreno_cpp_args += '-Wno-c99-designator'
-endif
-
 libfreedreno_dependencies = [
   dep_libdrm,
   idep_mesautil,