Skip to content

Commit c69d29e

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix GH-15515: Configure error grep illegal option q (#15516)
2 parents 9147687 + 9e63e20 commit c69d29e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ esac
237237

238238
dnl Detect musl libc
239239
AC_MSG_CHECKING([whether we are using musl libc])
240-
if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
240+
if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
241241
then
242242
AC_MSG_RESULT([yes])
243243
AC_DEFINE([__MUSL__], [1], [Define to 1 when using musl libc.])

ext/posix/config.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ if test "$PHP_POSIX" = "yes"; then
4343

4444
dnl Skip pathconf and fpathconf check on musl libc due to limited implementation
4545
dnl (first argument is not validated and has different error).
46-
AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep -q "^musl"],[],
46+
AS_IF([command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1],
47+
[],
4748
[AC_CHECK_FUNCS([pathconf fpathconf])])
4849

4950
AC_CACHE_CHECK([for working ttyname_r() implementation],

0 commit comments

Comments
 (0)