summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorAkim Demaille <akim.demaille@gmail.com>2020-02-01 07:03:13 +0100
committerkocsismate <kocsismate@woohoolabs.com>2020-02-01 14:21:21 +0100
commit2127a37b833a863e28a4692e7394613b89c89290 (patch)
tree73337ca9b08c5b5aca5ef6d7c9f0c2c58a08f633 /build
parentb97c9dc72a642bd0fe2e4f59fbb9c0c818addefa (diff)
downloadphp-git-2127a37b833a863e28a4692e7394613b89c89290.tar.gz
Bison: enable all the warnings and fix them
First, fix 5547d361208d90e12d53bb62bb2ffbbff9b93ca0: the definition of YFLAGS was not passed into the Makefile: AC_SUBST does not suffice, we need PHP_SUBST_OLD. While at it, allow to pass variable and value at the same time. Then pass -Wall to bison, rather than only -Wempty-rules. Use %precedence where associativity is useless. Remove useless %precedence. GH-5138
Diffstat (limited to 'build')
-rw-r--r--build/php.m410
1 files changed, 5 insertions, 5 deletions
diff --git a/build/php.m4 b/build/php.m4
index 87527f4381..8cdfb4da51 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -81,7 +81,7 @@ AC_DEFUN([PHP_DEFINE],[
dnl
dnl PHP_SUBST(varname)
dnl
-dnl Adds variable with it's value into Makefile, e.g.:
+dnl Adds variable with its value into Makefile, e.g.:
dnl CC = gcc
dnl
AC_DEFUN([PHP_SUBST],[
@@ -89,14 +89,14 @@ AC_DEFUN([PHP_SUBST],[
])
dnl
-dnl PHP_SUBST_OLD(varname)
+dnl PHP_SUBST_OLD(varname, [VALUE])
dnl
dnl Same as PHP_SUBST() but also substitutes all @VARNAME@ instances in every
dnl file passed to AC_OUTPUT.
dnl
AC_DEFUN([PHP_SUBST_OLD],[
- PHP_SUBST($1)
- AC_SUBST($1)
+ AC_SUBST($@)
+ PHP_SUBST([$1])
])
dnl
@@ -1815,7 +1815,7 @@ AC_DEFUN([PHP_PROG_BISON], [
done
if test "$php_bison_check" != "invalid"; then
- AC_SUBST([YFLAGS], [-Wempty-rule])
+ PHP_SUBST_OLD([YFLAGS], [-Wall])
AC_MSG_RESULT([$php_bison_version (ok)])
else
AC_MSG_RESULT([$php_bison_version])