Skip to content

Commit

Permalink
tools,gyp: fix regex for version matching
Browse files Browse the repository at this point in the history
Tool versions can be 10 and higher. Float patch from node-gyp to
accommodate this fact of life.

PR-URL: #21216
Refs: nodejs/node-gyp@293092c
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>
  • Loading branch information
Trott authored and rvagg committed Nov 28, 2018
1 parent 5166653 commit 772fc78
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/gyp/pylib/gyp/xcode_emulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,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.
Expand Down

0 comments on commit 772fc78

Please sign in to comment.