Skip to content

Commit 9f74329

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Append -Wno-implicit-fallthrough flag conditionally (#13331)
2 parents e6089b0 + f702437 commit 9f74329

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

ext/date/config0.m4

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ AC_CHECK_HEADERS([io.h])
44
dnl Check for strtoll, atoll
55
AC_CHECK_FUNCS([strtoll atoll])
66

7-
PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
7+
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
8+
[PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,
9+
[-Werror])
10+
11+
PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
812
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
913
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
1014

ext/hash/config.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ else
2020
SHA3_DIR="sha3/generic32lc"
2121
SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c"
2222
dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
23-
PHP_HASH_CFLAGS="-Wno-implicit-fallthrough"
23+
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
24+
[PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,
25+
[-Werror])
2426
],[
2527
AC_MSG_RESULT([yes])
2628
SHA3_DIR="sha3/generic64lc"

ext/pcre/config0.m4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ else
5757
pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
5858
pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
5959
pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
60-
PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -DHAVE_MEMMOVE -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
60+
61+
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
62+
[PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,
63+
[-Werror])
64+
65+
PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
6166
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
6267
AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
6368

0 commit comments

Comments
 (0)