Skip to content

Commit 842b90e

Browse files
committed
Fix phpGH-15515: Configure error grep illegal option q
On Solaris default grep doesn't support the -q option. In such cases the grep output can be redirected to /dev/null and the exit status is checked.
1 parent 6652a34 commit 842b90e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PHP NEWS
55
- Core:
66
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).
77
(zeriyoshi)
8+
. Fixed bug GH-15515 (Configure error grep illegal option q). (Peter Kokot)
89

910
- MySQLnd:
1011
. Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb,

configure.ac

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

263263
dnl Detect musl libc
264264
AC_MSG_CHECKING([whether we are using musl libc])
265-
if command -v ldd >/dev/null && ldd --version 2>&1 | grep -q ^musl
265+
if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
266266
then
267267
AC_MSG_RESULT(yes)
268268
AC_DEFINE([__MUSL__], [1], [Define when using musl libc])

0 commit comments

Comments
 (0)