Merge branch 'PHP-8.4'

petk · petk · commit 9ea0a6f43955 · 2025-06-14T07:51:50.000+02:00
diff --git a/cmake/cmake/Flags.cmake b/cmake/cmake/Flags.cmake
@@ -27,6 +27,7 @@ endif()
 if(
   CMAKE_C_COMPILER_ID STREQUAL "GNU"
   AND DEFINED CMAKE_C_COMPILER_VERSION
+  AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8
   AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.3
 )
   php_check_compiler_flag(C -fno-optimize-strlen PHP_HAS_FNO_OPTIMIZE_STRLEN_C)

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ endif()`
`27`	`27`	`if(`
`28`	`28`	`CMAKE_C_COMPILER_ID STREQUAL "GNU"`
`29`	`29`	`AND DEFINED CMAKE_C_COMPILER_VERSION`
	`30`	`+ AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8`
`30`	`31`	`AND CMAKE_C_COMPILER_VERSION VERSION_LESS 8.3`
`31`	`32`	`)`
`32`	`33`	`php_check_compiler_flag(C -fno-optimize-strlen PHP_HAS_FNO_OPTIMIZE_STRLEN_C)`