diff options
| author | Hans Wennborg <hans@hanshq.net> | 2014-12-04 01:59:58 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2014-12-04 01:59:58 +0000 |
| commit | 10ea5b0b4a10615afcce6bea40ae342a1e7a6140 (patch) | |
| tree | de57d95e49bb1eb11c2b5caf440814b8b7fc3cf2 /CMakeLists.txt | |
| parent | 955c3434f66d1309c0b76d7509ceb135c099ccd7 (diff) | |
CMake: try to actually fix the regexes for setting HOST_LINK_VERSION this time (PR21268)
The regex should not accept an empty version number.
The previous attempt at r223106 failed, and the build was still erroring:
CMake Error at tools/clang/CMakeLists.txt:269 (string):
string sub-command REGEX, mode REPLACE regex "[^0-9]*([0-9.]*).*" matched
an empty string.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@223333 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 35d8d690ed..b868b56c41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,10 +263,10 @@ if (APPLE) OUTPUT_VARIABLE LD_V_OUTPUT ) if (NOT HAD_ERROR) - if ("${LD_V_OUTPUT}" MATCHES ".*ld64.*") - string(REGEX REPLACE ".*ld64-([0-9.]*).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) - elseif ("${LD_V_OUTPUT}" MATCHES "[^0-9]*([0-9.]*).*") - string(REGEX REPLACE "[^0-9]*([0-9.]*).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) + if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") + string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) + elseif ("${LD_V_OUTPUT}" MATCHES "[^0-9]*([0-9.]+).*") + string(REGEX REPLACE "[^0-9]*([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) endif() else() message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") |