summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeParseImplicitLinkInfo.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-27 20:33:39 (GMT)
committerBrad King <brad.king@kitware.com>2013-05-06 12:45:34 (GMT)
commita2bc47df1a55530cb370590003836033d1b31e13 (patch)
treee83a2064d6c964511c675342baa546053b58cc7c /Modules/CMakeParseImplicitLinkInfo.cmake
parent793bf3fdacb3de5486e89b39824a25d29f0c8ff4 (diff)
downloadCMake-a2bc47df1a55530cb370590003836033d1b31e13.zip
CMake-a2bc47df1a55530cb370590003836033d1b31e13.tar.gz
CMake-a2bc47df1a55530cb370590003836033d1b31e13.tar.bz2
Recognize ld with toolchain prefix (#13960)
Teach CMAKE_PARSE_IMPLICIT_LINK_INFO to recognize linker invocations of the form "<toolchain-prefix>-ld" e.g. "x86_64-pc-linux-gnu-ld".
Diffstat (limited to 'Modules/CMakeParseImplicitLinkInfo.cmake')
-rw-r--r--Modules/CMakeParseImplicitLinkInfo.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeParseImplicitLinkInfo.cmake b/Modules/CMakeParseImplicitLinkInfo.cmake
index 80e0218..fa03630 100644
--- a/Modules/CMakeParseImplicitLinkInfo.cmake
+++ b/Modules/CMakeParseImplicitLinkInfo.cmake
@@ -29,7 +29,7 @@ function(CMAKE_PARSE_IMPLICIT_LINK_INFO text lib_var dir_var fwk_var log_var obj
endif()
# Construct a regex to match linker lines. It must match both the
# whole line and just the command (argv[0]).
- set(linker_regex "^( *|.*[/\\])(${linker}|ld|collect2)[^/\\]*( |$)")
+ set(linker_regex "^( *|.*[/\\])(${linker}|([^/\\]+-)?ld|collect2)[^/\\]*( |$)")
set(linker_exclude_regex "collect2 version ")
set(log "${log} link line regex: [${linker_regex}]\n")
string(REGEX REPLACE "\r?\n" ";" output_lines "${text}")