diff options
| author | Anatol Belski <ab@php.net> | 2016-09-29 12:56:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-29 12:56:49 +0200 |
| commit | 62bed405da99806aa94991ef0b933a1c41878aa5 (patch) | |
| tree | aa422b5d503b1de872b45d61d2d7a9c12c7fd486 /win32/build | |
| parent | e7f4355d9b6777bc9fc44ac3a109c52f5d304889 (diff) | |
| download | php-git-62bed405da99806aa94991ef0b933a1c41878aa5.tar.gz | |
sync win32 makefile with makedist zendparse exports
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
Diffstat (limited to 'win32/build')
| -rw-r--r-- | win32/build/Makefile | 3 | ||||
| -rw-r--r-- | win32/build/confutils.js | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 245643b160..33f145f269 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -54,6 +54,9 @@ Zend\zend_ini_parser.c Zend\zend_ini_parser.h: Zend\zend_ini_parser.y Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_parser.y $(BISON) --output=Zend/zend_language_parser.c -v -d -p zend Zend/zend_language_parser.y + @if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.c + @if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.h + @if "$(SED)" neq "" $(SED) -i "s,^#ifndef YYTOKENTYPE,#include \"zend.h\"\n#ifndef YYTOKENTYPE,g" Zend/zend_language_parser.h sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_parser.y $(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8ab4b7b0e9..e4270f705a 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2498,6 +2498,9 @@ function toolset_setup_project_tools() ERROR('bison is required') } + /* TODO throw error, ignore for now for BC. */ + PATH_PROG('sed'); + RE2C = PATH_PROG('re2c'); if (RE2C) { var intvers, intmin; |