diff --git a/presto-native-execution/CMakeLists.txt b/presto-native-execution/CMakeLists.txt index ca4ffcf03df7a..5474fe970e6d8 100644 --- a/presto-native-execution/CMakeLists.txt +++ b/presto-native-execution/CMakeLists.txt @@ -38,6 +38,23 @@ set(DISABLED_WARNINGS -Wno-deprecated-declarations \ -Wno-restrict") +# Disable -Wstringop-overflow to avoid a false positive in the following +# compiler versions. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117983 +# +# NOTE: Typically, this is disabled using a VELOX_SUPPRESS_STRINGOP guard within +# the code; but that doesn't apply to 3rd-party libraries, so we need to disable +# it globally for now. +if("GNU" STREQUAL "${CMAKE_CXX_COMPILER_ID}" + AND ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12 + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.5) + OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13 + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.4) + OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14 + AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.3) + )) + set(DISABLED_WARNINGS "${DISABLED_WARNINGS} -Wno-stringop-overflow") +endif() + # Important warnings that must be explicitly enabled. set(ENABLE_WARNINGS "-Wreorder") diff --git a/presto-native-execution/velox b/presto-native-execution/velox index 28be93b4d05bf..d78134d58d09d 160000 --- a/presto-native-execution/velox +++ b/presto-native-execution/velox @@ -1 +1 @@ -Subproject commit 28be93b4d05bf6d9faa5058227dd4f8d4688b96d +Subproject commit d78134d58d09d2c138bec52fde924d3b120f7fb6