Skip to content

Commit 3dc9279

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix re2c version comparison
2 parents 873c505 + dd17659 commit 3dc9279

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

win32/build/confutils.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2853,6 +2853,10 @@ function toolset_setup_project_tools()
28532853
RE2CVERS = probe_binary(RE2C, "version");
28542854
STDOUT.WriteLine(' Detected re2c version ' + RE2CVERS);
28552855

2856+
if (RE2CVERS.match(/^\d+.\d+$/)) {
2857+
RE2CVERS += ".0";
2858+
}
2859+
28562860
intvers = RE2CVERS.replace(pattern, '') - 0;
28572861
intmin = MINRE2C.replace(pattern, '') - 0;
28582862

0 commit comments

Comments
 (0)