From: Anatol Belski Date: Mon, 13 Aug 2018 07:18:38 +0000 (+0200) Subject: Sync with e0fe6674 X-Git-Tag: php-7.3.0beta2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdaa540fd8340b466af950ad65a1623b345a051c;p=php Sync with e0fe6674 --- diff --git a/ext/json/Makefile.frag.w32 b/ext/json/Makefile.frag.w32 index eaf47e22be..ceaf2595cb 100644 --- a/ext/json/Makefile.frag.w32 +++ b/ext/json/Makefile.frag.w32 @@ -1,6 +1,6 @@ ext\json\json_scanner.c: ext\json\json_scanner.re - $(RE2C) -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re + $(RE2C) $(RE2C_FLAGS) -t ext/json/php_json_scanner_defs.h --no-generation-date -bci -o ext/json/json_scanner.c ext/json/json_scanner.re ext\json\json_parser.tab.c: ext\json\json_parser.y $(BISON) --defines -l ext/json/json_parser.y -o ext/json/json_parser.tab.c diff --git a/ext/pdo/Makefile.frag.w32 b/ext/pdo/Makefile.frag.w32 index 3e21fad7e4..3958f95a9f 100644 --- a/ext/pdo/Makefile.frag.w32 +++ b/ext/pdo/Makefile.frag.w32 @@ -1,5 +1,5 @@ ext\pdo\pdo_sql_parser.c: ext\pdo\pdo_sql_parser.re cd $(PHP_SRC_DIR) - $(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 diff --git a/ext/phar/Makefile.frag.w32 b/ext/phar/Makefile.frag.w32 index c50b1dbc51..29906a3723 100644 --- a/ext/phar/Makefile.frag.w32 +++ b/ext/phar/Makefile.frag.w32 @@ -1,5 +1,5 @@ ext\phar\phar_path_check.c: ext\phar\phar_path_check.re cd $(PHP_SRC_DIR) - $(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 diff --git a/ext/standard/Makefile.frag.w32 b/ext/standard/Makefile.frag.w32 index 640e4840d3..15ad0789fd 100644 --- a/ext/standard/Makefile.frag.w32 +++ b/ext/standard/Makefile.frag.w32 @@ -1,11 +1,11 @@ ext\standard\var_unserializer.c: ext\standard\var_unserializer.re cd $(PHP_SRC_DIR) - $(RE2C) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext\standard\url_scanner_ex.c: ext\standard\url_scanner_ex.re cd $(PHP_SRC_DIR) - $(RE2C) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re + $(RE2C) $(RE2C_FLAGS) --no-generation-date -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re $(BUILD_DIR)\ext\standard\basic_functions.obj: $(PHP_SRC_DIR)\Zend\zend_language_parser.h