Fix bug #76030 RE2C_FLAGS rarely honoured

Since PHP 5.3 the default lexer generator is RE2C. On Unix-alike build
systems there is also optional configure option --enable-re2c-cgoto
which enables optimized conditional jumps using non-standard computed
goto extension. It is available since RE2C 0.10.3 so it's well covered
by RE2C versions PHP uses. This patch syncs usage of -g option accross
the PHP Unix-alike build system.

diff --git a/ext/json/Makefile.frag b/ext/json/Makefile.frag
index cb26acabc70af35b45775ef2522576f9810aadd9..d35abfc8c42871de4a740b7e6763827bee72881c 100644 (file)
--- a/ext/json/Makefile.frag
+++ b/ext/json/Makefile.frag
@@ -1,5 +1,5 @@
 $(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re
-       $(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re
+       $(RE2C) $(RE2C_FLAGS) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re
 
 $(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y
        $(YACC) --defines -l $(srcdir)/json_parser.y -o $@

diff --git a/ext/pdo/Makefile.frag b/ext/pdo/Makefile.frag
index d2b59744efc07e583e1e047f5b46afc39236f65d..698699be759bf21f933acd769a18ef1e8cd94912 100644 (file)
--- a/ext/pdo/Makefile.frag
+++ b/ext/pdo/Makefile.frag
@@ -9,9 +9,9 @@ PDO_HEADER_FILES= \
 $(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
        @(cd $(top_srcdir); \
        if test -f ./pdo_sql_parser.re; then \
-               $(RE2C) --no-generation-date -o pdo_sql_parser.c pdo_sql_parser.re; \
+               $(RE2C) $(RE2C_FLAGS) --no-generation-date -o pdo_sql_parser.c pdo_sql_parser.re; \
        else \
-               $(RE2C) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re; \
+               $(RE2C) $(RE2C_FLAGS) --no-generation-date -o ext/pdo/pdo_sql_parser.c ext/pdo/pdo_sql_parser.re; \
        fi)
 
 install-pdo-headers:

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index 0e3713fc63b69ec04ad60fa6d92b4dd9ee9a2a77..e1dda157238b6f09efaea93006d41b267499520e 100644 (file)
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -1,9 +1,9 @@
 $(srcdir)/phar_path_check.c: $(srcdir)/phar_path_check.re
        @(cd $(top_srcdir); \
        if test -f ./php_phar.h; then \
-               $(RE2C) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \
+               $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o phar_path_check.c phar_path_check.re; \
        else \
-               $(RE2C) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \
+               $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/phar/phar_path_check.c ext/phar/phar_path_check.re; \
        fi)
 
 pharcmd: $(builddir)/phar.php $(builddir)/phar.phar

diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index 8b6e3e233ab17da087bda7d3eedea987aff79104..2cc75ca93f6a36baec3bcc1c3052463be8eccc18 100644 (file)
--- a/ext/standard/Makefile.frag
+++ b/ext/standard/Makefile.frag
@@ -1,9 +1,9 @@
 
 $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re
-       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re)
+       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re)
 
 $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re
-       @(cd $(top_srcdir); $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c    ext/standard/url_scanner_ex.re)
+       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c      ext/standard/url_scanner_ex.re)
 
 $(builddir)/info.lo: $(builddir)/../../main/build-defs.h