Skip to content

Commit 62bed40

Browse files
committed
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.
1 parent e7f4355 commit 62bed40

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

win32/build/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ Zend\zend_ini_parser.c Zend\zend_ini_parser.h: Zend\zend_ini_parser.y
5454

5555
Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_parser.y
5656
$(BISON) --output=Zend/zend_language_parser.c -v -d -p zend Zend/zend_language_parser.y
57+
@if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.c
58+
@if "$(SED)" neq "" $(SED) -i "s,^int zendparse\(.*\),ZEND_API int zendparse\1,g" Zend/zend_language_parser.h
59+
@if "$(SED)" neq "" $(SED) -i "s,^#ifndef YYTOKENTYPE,#include \"zend.h\"\n#ifndef YYTOKENTYPE,g" Zend/zend_language_parser.h
5760

5861
sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_parser.h: sapi\phpdbg\phpdbg_parser.y
5962
$(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d -p phpdbg_ sapi/phpdbg/phpdbg_parser.y

win32/build/confutils.js

+3
Original file line numberDiff line numberDiff line change
@@ -2498,6 +2498,9 @@ function toolset_setup_project_tools()
24982498
ERROR('bison is required')
24992499
}
25002500

2501+
/* TODO throw error, ignore for now for BC. */
2502+
PATH_PROG('sed');
2503+
25012504
RE2C = PATH_PROG('re2c');
25022505
if (RE2C) {
25032506
var intvers, intmin;

0 commit comments

Comments
 (0)