diff options
| author | Anatol Belski <ab@php.net> | 2017-04-11 11:38:07 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-11 11:38:07 +0200 |
| commit | be540347e28d4f3d00749d87b591a1062cf4a470 (patch) | |
| tree | ff4018e186a16652df34fb04f107741d10333a36 | |
| parent | bc9b3c5d20e63d5aedbd47ab01f90fc40366ddd0 (diff) | |
| parent | 3dc92791885b662f700768cd93c43d5f3f59f374 (diff) | |
| download | php-git-be540347e28d4f3d00749d87b591a1062cf4a470.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
fix re2c version comparison
| -rw-r--r-- | win32/build/confutils.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 3724878758..d93cfe4a68 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2890,6 +2890,10 @@ function toolset_setup_project_tools() RE2CVERS = probe_binary(RE2C, "version"); STDOUT.WriteLine(' Detected re2c version ' + RE2CVERS); + if (RE2CVERS.match(/^\d+.\d+$/)) { + RE2CVERS += ".0"; + } + intvers = RE2CVERS.replace(pattern, '') - 0; intmin = MINRE2C.replace(pattern, '') - 0; |