mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Merge branch 'PHP-7.3'
* PHP-7.3: Fix bug #76030 RE2C_FLAGS rarely honoured
This commit is contained in:
commit
f689223b4e
@ -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 $@
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user