diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-29 12:38:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-07-29 12:39:30 +0200 |
| commit | 678f5b60681543d891aa33efa88ccce476d3ddde (patch) | |
| tree | 368c49b33e70ce348f240a37528df7c91f88cceb | |
| parent | 12bd3cc14695bcdd2ffbbacfb37b5602c2288f95 (diff) | |
| parent | e767ca60a0b333fa387e23a0a56482fe2e81b564 (diff) | |
| download | php-git-678f5b60681543d891aa33efa88ccce476d3ddde.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79895: support = in PHP_CHECK_GCC_ARG m4 macro
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build/php.m4 | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -6,6 +6,8 @@ PHP NEWS . Fixed bug #79884 (PHP_CONFIG_FILE_PATH is meaningless). (cmb) . Fixed bug #77932 (File extensions are case-sensitive). (cmb) . Fixed bug #79806 (realpath() erroneously resolves link to link). (cmb) + . Fixed bug #79895 (PHP_CHECK_GCC_ARG does not allow flags with equal sign). + (Santiago M. Mola) - LDAP: . Fixed memory leaks. (ptomulik) diff --git a/build/php.m4 b/build/php.m4 index fdcf8a22db..e5b85b24c4 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -308,8 +308,8 @@ dnl dnl PHP_CHECK_GCC_ARG(arg, action-if-found, action-if-not-found) dnl AC_DEFUN([PHP_CHECK_GCC_ARG],[ - gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_) - AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [ + gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z=-,a-z__) + AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z=-,a-z__), [ echo 'void somefunc() { };' > conftest.c cmd='$CC $1 -c conftest.c' if eval $cmd 2>&1 | $EGREP -e $1 >/dev/null ; then |