freedreno/meson: remove C++ cross-build arguments HACKs
After the fix in commit b016f218fb (ci/android: fix meson C++
cross-compiler argument detection, 2025-01-14) the cross-build meson
hacks should not be necessary anymore for the CI builds to pass.
Remove the hacks making sure that the removed arguments are all in the
regular list of arguments passed through cpp.get_supported_arguments()
Reviewed-by: Rob Clark <robclark@freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33209>
This commit is contained in:
committed by
Marge Bot
parent
ce3a137892
commit
38c0ed5fc4
@@ -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,
|
||||
|
||||
@@ -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],
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user