diff options
| author | Alex Lorenz <arphaman@gmail.com> | 2018-06-28 00:39:09 +0000 |
|---|---|---|
| committer | Alex Lorenz <arphaman@gmail.com> | 2018-06-28 00:39:09 +0000 |
| commit | 3ddd210ae538eda476b0752455b49c0012783bfd (patch) | |
| tree | f8ac18b5746047c79fa9ee882b828838f38be0a2 | |
| parent | 9a209ad1d88e73be3169a2373b4dbeb093ef0765 (diff) | |
| download | bcm5719-llvm-3ddd210ae538eda476b0752455b49c0012783bfd.tar.gz bcm5719-llvm-3ddd210ae538eda476b0752455b49c0012783bfd.zip | |
[cmake][xcode-toolchain] add support for major Xcode version >= 10
The regex that extracts the Xcode version should support major versions with two
digits.
rdar://41465184
llvm-svn: 335801
| -rw-r--r-- | llvm/tools/xcode-toolchain/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/xcode-toolchain/CMakeLists.txt b/llvm/tools/xcode-toolchain/CMakeLists.txt index d433c52febf..0ae5e374fe9 100644 --- a/llvm/tools/xcode-toolchain/CMakeLists.txt +++ b/llvm/tools/xcode-toolchain/CMakeLists.txt @@ -49,7 +49,7 @@ if(NOT XCODE_VERSION) OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_FILE /dev/null ) - string(REGEX MATCH "Xcode ([0-9]([.][0-9])+)" version_match ${xcodebuild_version}) + string(REGEX MATCH "Xcode ([0-9][0-9]?([.][0-9])+)" version_match ${xcodebuild_version}) if(version_match) message(STATUS "Identified Xcode Version: ${CMAKE_MATCH_1}") set(XCODE_VERSION ${CMAKE_MATCH_1}) |
