diff options
| author | Rich Trott <rtrott@gmail.com> | 2018-06-08 10:23:18 -0700 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2018-06-08 17:10:34 -0700 |
| commit | a9e70d7d0b50ed615428e8344d510effb6713f02 (patch) | |
| tree | 7acfd24c8af05e29eb1822b968d8b7ab688110f0 /tools/gyp | |
| parent | be8cfc7f7e49ac3e42a4c65e83002eb6a907e04b (diff) | |
| download | android-node-v8-a9e70d7d0b50ed615428e8344d510effb6713f02.tar.gz android-node-v8-a9e70d7d0b50ed615428e8344d510effb6713f02.tar.bz2 android-node-v8-a9e70d7d0b50ed615428e8344d510effb6713f02.zip | |
tools,gyp: fix regex for version matching
Tool versions can be 10 and higher. Float patch from node-gyp to
accommodate this fact of life.
PR-URL: https://github.com/nodejs/node/pull/21216
Refs: https://github.com/nodejs/node-gyp/commit/293092c362febffe19f72712467565045e08e8f1
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'tools/gyp')
| -rw-r--r-- | tools/gyp/pylib/gyp/xcode_emulation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py index 667c53695a..9082b9da35 100644 --- a/tools/gyp/pylib/gyp/xcode_emulation.py +++ b/tools/gyp/pylib/gyp/xcode_emulation.py @@ -1403,7 +1403,7 @@ def XcodeVersion(): except: version = CLTVersion() if version: - version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] + version = re.match(r'(\d+\.\d+\.?\d*)', version).groups()[0] else: raise GypError("No Xcode or CLT version detected!") # The CLT has no build information, so we return an empty string. |